diff --git a/src/xrAICore/Navigation/a_star.h b/src/xrAICore/Navigation/a_star.h index 692ac7c644d..847c52c91cd 100644 --- a/src/xrAICore/Navigation/a_star.h +++ b/src/xrAICore/Navigation/a_star.h @@ -46,46 +46,6 @@ template < bool euclidian_heuristics = true, typename _data_storage_base = CVertexPath, template class _vertex = CEmptyClassTemplate, - template < - typename _1, - typename _2 - > - class _builder_allocator_constructor = CBuilderAllocatorConstructor, - template < - typename _1, - typename _2, - typename _3, - template < - typename _1, - typename _2 - > - class _4 - > - class _manager_builder_allocator_constructor = CManagerBuilderAllocatorConstructor, - template < - typename _algorithm, - typename _manager, - typename _builder, - typename _allocator, - template class _vertex, - template < - typename _1, - typename _2 - > - class _builder_allocator_constructor = CBuilderAllocatorConstructor, - template < - typename _1, - typename _2, - typename _3, - template < - typename _1, - typename _2 - > - class _4 - > - class _manager_builder_allocator_constructor = CManagerBuilderAllocatorConstructor - > - class _data_storage_constructor = CDataStorageConstructor, typename _iteration_type = u32 > class CAStar : public CDijkstra < _dist_type, @@ -95,9 +55,6 @@ template < euclidian_heuristics, _data_storage_base, AStar::_Vertex<_dist_type,_vertex>::_vertex, - _builder_allocator_constructor, - _manager_builder_allocator_constructor, - _data_storage_constructor, _iteration_type > { @@ -110,9 +67,6 @@ template < euclidian_heuristics, _data_storage_base, AStar::_Vertex<_dist_type,_vertex>::_vertex, - _builder_allocator_constructor, - _manager_builder_allocator_constructor, - _data_storage_constructor, _iteration_type > inherited; typedef typename CDataStorage::CGraphVertex CGraphVertex; diff --git a/src/xrAICore/Navigation/a_star_inline.h b/src/xrAICore/Navigation/a_star_inline.h index 7c6d7ce180b..bb4df2d2557 100644 --- a/src/xrAICore/Navigation/a_star_inline.h +++ b/src/xrAICore/Navigation/a_star_inline.h @@ -17,46 +17,6 @@ bool euclidian_heuristics,\ typename _data_storage_base,\ template class _vertex,\ - template <\ - typename _1,\ - typename _2\ - >\ - class _builder_allocator_constructor,\ - template <\ - typename _1,\ - typename _2,\ - typename _3,\ - template <\ - typename _1,\ - typename _2\ - >\ - class _4\ - >\ - class _manager_builder_allocator_constructor,\ - template <\ - typename _algorithm,\ - typename _manager,\ - typename _builder,\ - typename _allocator,\ - template class _vertex,\ - template <\ - typename _1,\ - typename _2\ - >\ - class _builder_allocator_constructor,\ - template <\ - typename _1,\ - typename _2,\ - typename _3,\ - template <\ - typename _1,\ - typename _2\ - >\ - class _4\ - >\ - class _manager_builder_allocator_constructor\ - >\ - class _data_storage_constructor,\ typename _iteration_type\ > @@ -68,9 +28,6 @@ euclidian_heuristics,\ _data_storage_base,\ _vertex,\ - _builder_allocator_constructor,\ - _manager_builder_allocator_constructor,\ - _data_storage_constructor,\ _iteration_type\ > diff --git a/src/xrAICore/Navigation/dijkstra.h b/src/xrAICore/Navigation/dijkstra.h index 67fd7ad681c..be67cee8b53 100644 --- a/src/xrAICore/Navigation/dijkstra.h +++ b/src/xrAICore/Navigation/dijkstra.h @@ -19,46 +19,6 @@ template < bool euclidian_heuristics = true, typename _data_storage_base = CVertexPath, template class _vertex = CEmptyClassTemplate, - template < - typename _1, - typename _2 - > - class _builder_allocator_constructor = CBuilderAllocatorConstructor, - template < - typename _1, - typename _2, - typename _3, - template < - typename _1, - typename _2 - > - class _4 - > - class _manager_builder_allocator_constructor = CManagerBuilderAllocatorConstructor, - template < - typename _algorithm, - typename _manager, - typename _builder, - typename _allocator, - template class _vertex, - template < - typename _1, - typename _2 - > - class _builder_allocator_constructor = CBuilderAllocatorConstructor, - template < - typename _1, - typename _2, - typename _3, - template < - typename _1, - typename _2 - > - class _4 - > - class _manager_builder_allocator_constructor = CManagerBuilderAllocatorConstructor - > - class _data_storage_constructor = CDataStorageConstructor, typename _iteration_type = u32 > class CDijkstra { @@ -87,15 +47,15 @@ template < }; - typedef _data_storage_constructor< + typedef CDataStorageConstructor< _priority_queue, _vertex_manager, _data_storage_base, _vertex_allocator, _Vertex, - _builder_allocator_constructor, - _manager_builder_allocator_constructor - > CDataStorage; + CBuilderAllocatorConstructor, + CManagerBuilderAllocatorConstructor + > CDataStorage; protected: typedef typename CDataStorage::CGraphVertex CGraphVertex; diff --git a/src/xrAICore/Navigation/dijkstra_inline.h b/src/xrAICore/Navigation/dijkstra_inline.h index dca62b55b34..02e2c6ad3e4 100644 --- a/src/xrAICore/Navigation/dijkstra_inline.h +++ b/src/xrAICore/Navigation/dijkstra_inline.h @@ -16,47 +16,7 @@ typename _vertex_allocator,\ bool euclidian_heuristics,\ typename _data_storage_base,\ - template class _vertex,\ - template <\ - typename _1,\ - typename _2\ - >\ - class _builder_allocator_constructor,\ - template <\ - typename _1,\ - typename _2,\ - typename _3,\ - template <\ - typename _1,\ - typename _2\ - >\ - class _4\ - >\ - class _manager_builder_allocator_constructor,\ - template <\ - typename _algorithm,\ - typename _manager,\ - typename _builder,\ - typename _allocator,\ - template class _vertex,\ - template <\ - typename _1,\ - typename _2\ - >\ - class _builder_allocator_constructor,\ - template <\ - typename _1,\ - typename _2,\ - typename _3,\ - template <\ - typename _1,\ - typename _2\ - >\ - class _4\ - >\ - class _manager_builder_allocator_constructor\ - >\ - class _data_storage_constructor,\ + template class _vertex,\ typename _iteration_type\ > @@ -68,9 +28,6 @@ euclidian_heuristics,\ _data_storage_base,\ _vertex,\ - _builder_allocator_constructor,\ - _manager_builder_allocator_constructor,\ - _data_storage_constructor,\ _iteration_type\ >