Remove unnecesary typenames GCC doesn't like

OpenXRay · Sep 16, 2018 · 9c84cce · 9c84cce
1 parent 24f6bc3
commit 9c84cce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/xrAICore/Navigation/PathManagers/path_manager_game_vertex.h b/src/xrAICore/Navigation/PathManagers/path_manager_game_vertex.h
@@ -18,11 +18,10 @@ class CPathManager<CGameGraph, _DataStorage, SGameVertex<_dist_type, _index_type
           _dist_type, _index_type, _iteration_type>
 {
 protected:
-    typedef CGameGraph _Graph;
-    typedef SGameVertex<_dist_type, _index_type, _iteration_type> _Parameters;
-    typedef typename CPathManager<_Graph, _DataStorage, SBaseParameters<_dist_type, _index_type, _iteration_type>,
-        _dist_type, _index_type, _iteration_type>
-        inherited;
+    using _Graph = CGameGraph;
+    using _Parameters = SGameVertex<_dist_type, _index_type, _iteration_type>;
+    using inherited = CPathManager<_Graph, _DataStorage, SBaseParameters<_dist_type, _index_type, _iteration_type>,
+        _dist_type, _index_type, _iteration_type>;
 
 protected:
     _Parameters* m_evaluator;

diff --git a/src/xrAICore/Navigation/PathManagers/path_manager_level_nearest_vertex.h b/src/xrAICore/Navigation/PathManagers/path_manager_level_nearest_vertex.h
@@ -17,11 +17,10 @@ class CPathManager<CLevelGraph, _DataStorage, SNearestVertex<_dist_type, _index_
           _dist_type, _index_type, _iteration_type>
 {
 protected:
-    typedef CLevelGraph _Graph;
-    typedef SNearestVertex<_dist_type, _index_type, _iteration_type> _Parameters;
-    typedef typename CPathManager<_Graph, _DataStorage, SBaseParameters<_dist_type, _index_type, _iteration_type>,
-        _dist_type, _index_type, _iteration_type>
-        inherited;
+    using _Graph = CLevelGraph;
+    using _Parameters = SNearestVertex<_dist_type, _index_type, _iteration_type>;
+    using inherited = CPathManager<_Graph, _DataStorage, SBaseParameters<_dist_type, _index_type, 
+          _iteration_type>, _dist_type, _index_type, _iteration_type>;
 
 protected:
     int x0, y0;