Skip to content

Commit 9c84cce

Browse files
committed
Remove unnecesary typenames GCC doesn't like
1 parent 24f6bc3 commit 9c84cce

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/xrAICore/Navigation/PathManagers/path_manager_game_vertex.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ class CPathManager<CGameGraph, _DataStorage, SGameVertex<_dist_type, _index_type
1818
_dist_type, _index_type, _iteration_type>
1919
{
2020
protected:
21-
typedef CGameGraph _Graph;
22-
typedef SGameVertex<_dist_type, _index_type, _iteration_type> _Parameters;
23-
typedef typename CPathManager<_Graph, _DataStorage, SBaseParameters<_dist_type, _index_type, _iteration_type>,
24-
_dist_type, _index_type, _iteration_type>
25-
inherited;
21+
using _Graph = CGameGraph;
22+
using _Parameters = SGameVertex<_dist_type, _index_type, _iteration_type>;
23+
using inherited = CPathManager<_Graph, _DataStorage, SBaseParameters<_dist_type, _index_type, _iteration_type>,
24+
_dist_type, _index_type, _iteration_type>;
2625

2726
protected:
2827
_Parameters* m_evaluator;

src/xrAICore/Navigation/PathManagers/path_manager_level_nearest_vertex.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ class CPathManager<CLevelGraph, _DataStorage, SNearestVertex<_dist_type, _index_
1717
_dist_type, _index_type, _iteration_type>
1818
{
1919
protected:
20-
typedef CLevelGraph _Graph;
21-
typedef SNearestVertex<_dist_type, _index_type, _iteration_type> _Parameters;
22-
typedef typename CPathManager<_Graph, _DataStorage, SBaseParameters<_dist_type, _index_type, _iteration_type>,
23-
_dist_type, _index_type, _iteration_type>
24-
inherited;
20+
using _Graph = CLevelGraph;
21+
using _Parameters = SNearestVertex<_dist_type, _index_type, _iteration_type>;
22+
using inherited = CPathManager<_Graph, _DataStorage, SBaseParameters<_dist_type, _index_type,
23+
_iteration_type>, _dist_type, _index_type, _iteration_type>;
2524

2625
protected:
2726
int x0, y0;

0 commit comments

Comments
 (0)