Move xr_hash_map into separate file

OpenXRay · Jan 6, 2018 · 82b415c · 82b415c
1 parent 838eb61
commit 82b415c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/src/Common/Common.vcxproj b/src/Common/Common.vcxproj
@@ -177,6 +177,7 @@
     <ClInclude Include="..\xrCommon\xr_set.h" />
     <ClInclude Include="..\xrCommon\xr_stack.h" />
     <ClInclude Include="..\xrCommon\xr_string.h" />
+    <ClInclude Include="..\xrCommon\xr_unordered_map.h" />
     <ClInclude Include="..\xrCommon\xr_vector.h" />
     <ClInclude Include="Common.hpp" />
     <ClInclude Include="Compiler.inl" />

diff --git a/src/Common/Common.vcxproj.filters b/src/Common/Common.vcxproj.filters
@@ -79,6 +79,9 @@
       <Filter>xrCommon</Filter>
     </ClInclude>
     <ClInclude Include="Common.hpp" />
+    <ClInclude Include="..\xrCommon\xr_unordered_map.h">
+      <Filter>xrCommon</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="NvMender2003">

diff --git a/src/xrCommon/xr_unordered_map.h b/src/xrCommon/xr_unordered_map.h
@@ -0,0 +1,14 @@
+#pragma once
+// XXX: upgrade std hash structures
+#ifndef _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
+#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
+#endif
+#include <hash_map>
+#include <unordered_map>
+#include "xrCore/Memory/XRayAllocator.hpp"
+
+template <typename K, class V, class _Traits = stdext::hash_compare<K, std::less<K>>, typename allocator = XRay::xray_allocator<std::pair<K, V>>>
+using xr_hash_map = stdext::hash_map<K, V, _Traits, allocator>;
+
+template<class Key, class T, class Hasher = std::hash<Key>, class KeyEqual = std::equal_to<Key>, class allocator = XRay::xray_allocator<std::pair<const Key, T>>>
+using xr_unordered_map = std::unordered_map<Key, T, Hasher, KeyEqual, allocator>;
diff --git a/src/xrCore/_stl_extensions.h b/src/xrCore/_stl_extensions.h
@@ -18,24 +18,13 @@
 #include "xrstring.h"
 #include "xrCommon/inlining_macros.h"
 #include "xrCommon/xr_string.h"
+#include "xrCommon/xr_unordered_map.h"
 #include "xrDebug_macros.h" // only for pragma todo. Remove once handled.
 
 #pragma todo("tamlin: This header includes pretty much every std collection there are. Compiler-hog! FIX!")
 
 using std::swap;
 
-#ifndef _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
-#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
-#endif
-#include <hash_map>
-template <typename K, class V, class _Traits = stdext::hash_compare<K, std::less<K>>,
-    typename allocator = XRay::xray_allocator<std::pair<K, V>>>
-class xr_hash_map : public stdext::hash_map<K, V, _Traits, allocator>
-{
-public:
-    u32 size() const { return (u32) __super ::size(); }
-};
-
 #include "xrCommon/predicates.h"
 
 // tamlin: TODO (low priority, for a rainy day): Rename these macros from DEFINE_* to DECLARE_*

diff --git a/src/xrGame/xrServer.h b/src/xrGame/xrServer.h
@@ -14,7 +14,7 @@
 #include "secure_messaging.h"
 #include "xrServer_updates_compressor.h"
 #include "xrClientsPool.h"
-#include "xrCore/_stl_extensions.h" // xr_hash_map
+#include "xrCommon/xr_unordered_map.h"
 
 #ifdef DEBUG
 //. #define SLOW_VERIFY_ENTITIES

diff --git a/src/xrScriptEngine/script_engine.hpp b/src/xrScriptEngine/script_engine.hpp
@@ -13,7 +13,7 @@
 #include "xrScriptEngine/script_space_forward.hpp"
 #include "xrScriptEngine/Functor.hpp"
 #include "xrCore/Threading/Lock.hpp"
-#include "xrCore/_stl_extensions.h" // xr_hash_map
+#include "xrCommon/xr_unordered_map.h"
 
 struct lua_State;