Fix VS debug build

molecula112 · Apr 11, 2018 · d3123b9 · d3123b9
1 parent 4a371ee
commit d3123b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h
@@ -127,7 +127,7 @@ class TypeUnorderedMapContainer
             }
             else
             {
-                assert(i->second == object && "Object with certain key already in but objects are different!");
+                assert(_element[handle] == object && "Object with certain key already in but objects are different!");
                 return false;
             }
         }

diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
@@ -163,5 +163,5 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mangosd.conf.dist.in ${CMAKE_CURRENT_
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist DESTINATION ${CONF_INSTALL_DIR})
 
 if(WIN32 AND MSVC)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}" CONFIGURATIONS Debug)
+    install(FILES $<TARGET_PDB_FILE:${EXECUTABLE_NAME}> DESTINATION ${BIN_DIR} OPTIONAL)
 endif()
diff --git a/src/realmd b/src/realmd
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,7 +127,7 @@ class TypeUnorderedMapContainer @@
                 }
                 else
                 {
-                    assert(i->second == object && "Object with certain key already in but objects are different!");
+                    assert(_element[handle] == object && "Object with certain key already in but objects are different!");
                     return false;
                 }
             }
@@ Expand Down @@