[ZH] Fix hash_map errors for Zero Hour Tools build (TheSuperHackers#509)

Author: xezon

Dependencies/Utility/Utility/hash_map_adapter.h

@@ -0,0 +1,25 @@
+// TheSuperHackers
+// This file includes a hash map that is compatible with vs6, STLPort and modern c++ for the most part.
+// There are differences, for example std::hash_map::resize is the equivalent to std::unordered_map::reserve.
+
+#pragma once
+
+#if defined(USING_STLPORT) || (defined(_MSC_VER) && _MSC_VER < 1300)
+
+#include <hash_map>
+
+#else
+
+#include <unordered_map>
+namespace std
+{
+template <
+	class _Kty,
+	class _Ty,
+	class _Hasher = hash<_Kty>,
+	class _Keyeq = equal_to<_Kty>,
+	class _Alloc = allocator<pair<const _Kty, _Ty>>>
+using hash_map = unordered_map<_Kty, _Ty, _Hasher, _Keyeq, _Alloc>;
+}
+
+#endif

GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h

@@ -70,21 +70,7 @@ enum DrawableID;
 
 #include <algorithm>
 #include <bitset>
-#ifdef USING_STLPORT
-#include <hash_map>
-#else
-#include <unordered_map>
-namespace std
-{
-template <
-	class _Kty,
-	class _Ty,
-	class _Hasher = hash<_Kty>,
-	class _Keyeq = equal_to<_Kty>,
-	class _Alloc = allocator<pair<const _Kty, _Ty>>>
-using hash_map = unordered_map<_Kty, _Ty, _Hasher, _Keyeq, _Alloc>;
-}
-#endif
+#include <Utility/hash_map_adapter.h>
 #include <list>
 #include <map>
 #include <queue>

GeneralsMD/Code/Tools/CRCDiff/CMakeLists.txt

@@ -15,6 +15,7 @@ set_target_properties(z_crcdiff PROPERTIES OUTPUT_NAME crcdiff)
 target_sources(z_crcdiff PRIVATE ${CRCDIFF_SRC})
 
 target_link_libraries(z_crcdiff PRIVATE
+    gz_utility
     stlport
 )
 

GeneralsMD/Code/Tools/CRCDiff/expander.h

@@ -27,7 +27,7 @@
 #define __EXPANDER_H__
 
 #include <map>
-#include <hash_map>
+#include <Utility/hash_map_adapter.h>
 #include <string>
 
 typedef std::map<std::string, std::string> ExpansionMap;

GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt

@@ -40,6 +40,7 @@ target_link_libraries(z_particleeditor PRIVATE
     d3d8lib
     dbghelplib
     imm32
+    gz_utility
     stlport
     vfw32
     winmm

GeneralsMD/Code/Tools/matchbot/CMakeLists.txt

@@ -68,6 +68,7 @@ target_include_directories(z_matchbot PRIVATE . wlib wnet)
 
 target_link_libraries(z_matchbot PRIVATE
     gamespy::gamespy
+    gz_utility
     stlport
 )
 

GeneralsMD/Code/Tools/matchbot/generals.h

@@ -32,7 +32,8 @@
 #include <bitset>
 #include <vector>
 #include <map>
-#include <hash_map>
+#include <Utility/hash_map_adapter.h>
+
 typedef std::vector<bool> MapBitSet;
 
 // =====================================================================