Move function implementations to class definitions.

OpenXRay · Dec 10, 2015 · 5c12997 · 5c12997
1 parent f568932
commit 5c12997
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 113 deletions.
diff --git a/src/xrAICore/Navigation/builder_allocator_constructor.h b/src/xrAICore/Navigation/builder_allocator_constructor.h
@@ -20,17 +20,19 @@ class BuilderAllocatorDataStorage :
 public:
     typedef typename _path_builder::template CDataStorage<_vertex>	CDataStorageBase;
     typedef typename _vertex_allocator::template CDataStorage<
-        typename _path_builder::template CDataStorage<
-			_vertex
-		>::CGraphVertex
-	>												CDataStorageAllocator;
+        typename _path_builder::template CDataStorage<_vertex>::CGraphVertex> CDataStorageAllocator;
 	typedef typename CDataStorageBase::CGraphVertex CGraphVertex;
 	typedef typename CGraphVertex::_index_type		_index_type;
 
 public:
-	IC							BuilderAllocatorDataStorage(const u32 vertex_count);
-	virtual						~BuilderAllocatorDataStorage();
-	IC		void				init			();
+    BuilderAllocatorDataStorage(const u32 vertex_count) :
+        CDataStorageBase(vertex_count),
+        CDataStorageAllocator()
+    {}
+    virtual ~BuilderAllocatorDataStorage() {}
+    void init()
+    {
+        CDataStorageBase::init();
+        CDataStorageAllocator::init();
+    }
 };
-
-#include "xrAICore/Navigation/builder_allocator_constructor_inline.h"
diff --git a/src/xrAICore/Navigation/builder_allocator_constructor_inline.h b/src/xrAICore/Navigation/builder_allocator_constructor_inline.h
diff --git a/src/xrAICore/Navigation/data_storage_constructor.h b/src/xrAICore/Navigation/data_storage_constructor.h
@@ -18,7 +18,7 @@ template <
 	typename _manager, // CVertexManagerFixed|CVertexManagerHashFixed
 	typename _builder, // CEdgePath|CVertexPath
 	typename _allocator, // CVertexAllocatorFixed
-	template <typename _T> class _vertex = CEmptyClassTemplate
+	template <typename _T> class _vertex = CEmptyClassTemplate // _Vertex
 >
 struct CDataStorageConstructor : // CDataStorageBucketList::CDataStorage<CManagerBuilderAllocatorConstructor<manager, path, allocator> >
     public _algorithm::template CDataStorage<

diff --git a/src/xrAICore/Navigation/manager_builder_allocator_constructor.h b/src/xrAICore/Navigation/manager_builder_allocator_constructor.h
@@ -35,11 +35,12 @@ struct CManagerBuilderAllocatorConstructor {
 		typedef typename CGraphVertex::_index_type	_index_type;
 
 	public:
-		IC							CDataStorage	(const u32 vertex_count);
-		virtual						~CDataStorage	();
-		IC		void				init			();
-		IC		CGraphVertex		&create_vertex	(const _index_type &vertex_id);
+        CDataStorage(const u32 vertex_count) :
+            inherited(vertex_count)
+        {}
+        virtual ~CDataStorage() {}
+        void init() { inherited::init(); }
+        CGraphVertex &create_vertex(const _index_type &vertex_id)
+        { return inherited::create_vertex(inherited_allocator::create_vertex(), vertex_id); }
 	};
 };
-
-#include "xrAICore/Navigation/manager_builder_allocator_constructor_inline.h"
diff --git a/src/xrAICore/Navigation/manager_builder_allocator_constructor_inline.h b/src/xrAICore/Navigation/manager_builder_allocator_constructor_inline.h
diff --git a/src/xrAICore/xrAICore.vcxproj b/src/xrAICore/xrAICore.vcxproj
@@ -262,7 +262,6 @@
     <ClInclude Include="Navigation\a_star.h" />
     <ClInclude Include="Navigation\a_star_inline.h" />
     <ClInclude Include="Navigation\builder_allocator_constructor.h" />
-    <ClInclude Include="Navigation\builder_allocator_constructor_inline.h" />
     <ClInclude Include="Navigation\data_storage_binary_heap.h" />
     <ClInclude Include="Navigation\data_storage_binary_heap_inline.h" />
     <ClInclude Include="Navigation\data_storage_bucket_list.h" />
@@ -291,7 +290,6 @@
     <ClInclude Include="Navigation\level_graph_space.h" />
     <ClInclude Include="Navigation\level_graph_vertex_inline.h" />
     <ClInclude Include="Navigation\manager_builder_allocator_constructor.h" />
-    <ClInclude Include="Navigation\manager_builder_allocator_constructor_inline.h" />
     <ClInclude Include="Navigation\PathManagers\path_manager.h" />
     <ClInclude Include="Navigation\PathManagers\path_manager_game.h" />
     <ClInclude Include="Navigation\PathManagers\path_manager_game_inline.h" />

diff --git a/src/xrAICore/xrAICore.vcxproj.filters b/src/xrAICore/xrAICore.vcxproj.filters
@@ -183,18 +183,12 @@
     <ClInclude Include="Navigation\builder_allocator_constructor.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
     </ClInclude>
-    <ClInclude Include="Navigation\builder_allocator_constructor_inline.h">
-      <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
-    </ClInclude>
     <ClInclude Include="Navigation\data_storage_constructor.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
     </ClInclude>
     <ClInclude Include="Navigation\manager_builder_allocator_constructor.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
     </ClInclude>
-    <ClInclude Include="Navigation\manager_builder_allocator_constructor_inline.h">
-      <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
-    </ClInclude>
     <ClInclude Include="Navigation\edge_path.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\PathBuilders</Filter>
     </ClInclude>