Skip to content

Commit a7e4f40

Browse files
committed
xrGame: Don't use the name of a template as its alias (causes warning)
1 parent 90d4a1d commit a7e4f40

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

src/xrGame/action_planner.h

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,17 @@ class CActionPlanner
2626
_condition_evaluator, u32, _reverse_search, _world_operator_ptr, _condition_evaluator_ptr>
2727
{
2828
public:
29-
typedef CProblemSolver<GraphEngineSpace::CWorldProperty, GraphEngineSpace::CWorldState, _world_operator,
30-
_condition_evaluator, u32, _reverse_search, _world_operator_ptr, _condition_evaluator_ptr>
31-
CProblemSolver;
32-
using COperator = typename CProblemSolver::COperator;
33-
using CConditionEvaluator = typename CProblemSolver::CConditionEvaluator;
34-
using _condition_type = typename CProblemSolver::condition_type;
35-
using _edge_type = typename CProblemSolver::edge_type;
36-
using _value_type = typename CProblemSolver::value_type;
37-
using _operator_ptr = typename CProblemSolver::operator_ptr;
38-
typedef CProblemSolver inherited;
39-
typedef typename inherited::edge_type _action_id_type;
40-
typedef GraphEngineSpace::CWorldProperty CWorldProperty;
41-
typedef GraphEngineSpace::CWorldState CWorldState;
42-
typedef _world_operator world_operator;
29+
using inherited = CProblemSolver<GraphEngineSpace::CWorldProperty, GraphEngineSpace::CWorldState,
30+
_world_operator, _condition_evaluator, u32, _reverse_search, _world_operator_ptr, _condition_evaluator_ptr>;
31+
using COperator = typename inherited::COperator;
32+
using CConditionEvaluator = typename inherited::CConditionEvaluator;
33+
using _condition_type = typename inherited::condition_type;
34+
using _edge_type = typename inherited::edge_type;
35+
using _value_type = typename inherited::value_type;
36+
using _operator_ptr = typename inherited::operator_ptr;
37+
using _action_id_type = typename inherited::edge_type;
38+
using CWorldProperty = GraphEngineSpace::CWorldProperty;
39+
using world_operator = _world_operator;
4340

4441
protected:
4542
bool m_initialized;

0 commit comments

Comments
 (0)