Move associative_vector and MbHelpers to xrCore.

OpenXRay · Oct 6, 2015 · c55786c · c55786c
1 parent a6e432f
commit c55786c
Show file tree

Hide file tree

Showing 69 changed files with 662 additions and 848 deletions.
diff --git a/src/utils/mp_configs_verifyer/pch.h b/src/utils/mp_configs_verifyer/pch.h
@@ -10,6 +10,6 @@
 #include <stdio.h>
 #include <conio.h>
 #include "xrServerEntities/object_broker.h"
-#include "xrServerEntities/associative_vector.h"
+#include "xrCore/Containers/AssociativeVector.hpp"
 
 #endif // #define PCH_H_INCLUDED
diff --git a/src/utils/mp_screenshots_info/pch.h b/src/utils/mp_screenshots_info/pch.h
@@ -8,6 +8,6 @@
 #include <stdio.h>
 #include <conio.h>
 #include "xrServerEntities/object_broker.h"
-#include "xrServerEntities/associative_vector.h"
+#include "xrCore/Containers/AssociativeVector.hpp"
 
 #endif // #define PCH_H_INCLUDED
diff --git a/src/utils/xrAI/patrol_path_storage.h b/src/utils/xrAI/patrol_path_storage.h
@@ -14,14 +14,14 @@ class CGameLevelCrossTable;
 class CGameGraph;
 
 #include "object_interfaces.h"
-#include "associative_vector.h"
+#include "xrCore/Containers/AssociativeVector.hpp"
 
 class CPatrolPathStorage : public IPureSerializeObject<IReader,IWriter> {
 private:
 	typedef IPureSerializeObject<IReader,IWriter>		inherited;
 
 public:
-	typedef associative_vector<shared_str,CPatrolPath*>	PATROL_REGISTRY;
+	typedef AssociativeVector<shared_str,CPatrolPath*>	PATROL_REGISTRY;
 	typedef PATROL_REGISTRY::iterator					iterator;
 	typedef PATROL_REGISTRY::const_iterator				const_iterator;
 

diff --git a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj
@@ -204,10 +204,6 @@
     <ClInclude Include="..\..\xrServerEntities\alife_monster_brain_inline.h" />
     <ClInclude Include="..\..\xrServerEntities\alife_movement_manager_holder.h" />
     <ClInclude Include="..\..\xrServerEntities\alife_space.h" />
-    <ClInclude Include="..\..\xrServerEntities\associative_vector.h" />
-    <ClInclude Include="..\..\xrServerEntities\associative_vector_compare_predicate.h" />
-    <ClInclude Include="..\..\xrServerEntities\associative_vector_compare_predicate_inline.h" />
-    <ClInclude Include="..\..\xrServerEntities\associative_vector_inline.h" />
     <ClInclude Include="..\..\xrServerEntities\character_info.h" />
     <ClInclude Include="..\..\xrServerEntities\character_info_defs.h" />
     <ClInclude Include="..\..\xrServerEntities\clsid_game.h" />

diff --git a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj.filters b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj.filters
@@ -40,9 +40,6 @@
     <Filter Include="Common\SmartCast">
       <UniqueIdentifier>{ea79b7ec-1151-459a-a904-83c9d5bfdd2a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Common\associative_vector">
-      <UniqueIdentifier>{d137ef10-7858-429e-9d83-c9adca7a8920}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Scripts">
       <UniqueIdentifier>{beab8f12-fdda-4d4c-bff0-faf824bb05d7}</UniqueIdentifier>
     </Filter>
@@ -276,18 +273,6 @@
     <ClInclude Include="..\..\xrServerEntities\smart_cast_impl2.h">
       <Filter>Common\SmartCast</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xrServerEntities\associative_vector.h">
-      <Filter>Common\associative_vector</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\xrServerEntities\associative_vector_compare_predicate.h">
-      <Filter>Common\associative_vector</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\xrServerEntities\associative_vector_compare_predicate_inline.h">
-      <Filter>Common\associative_vector</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\xrServerEntities\associative_vector_inline.h">
-      <Filter>Common\associative_vector</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xrServerEntities\script_export_macroses.h">
       <Filter>Scripts</Filter>
     </ClInclude>