small self code review changes

frustra · Mar 13, 2017 · 91bc89f · 91bc89f
1 parent 41b816d
commit 91bc89f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,12 +14,7 @@ if (MSVC)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS /wd4800 /MP)
 endif()
 
-if (GLOMERATE_X86_TESTS)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin_x86)
-else()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
-endif()
-
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 

diff --git a/include/ecs/EntityImpl.hh b/include/ecs/EntityImpl.hh
@@ -47,7 +47,8 @@ namespace ecs
 	{
 		id = (static_cast<id_t>(generation) << INDEX_BITS)
 		   + (index & INDEX_MASK);
-		Assert((id & INDEX_MASK) == index);
+		Assert(Index() == index);
+		Assert(Generation() == generation);
 	}
 }