Skip to content

Commit

Permalink
xrAICore: fix some compilation error on Linux
Browse files Browse the repository at this point in the history
  • Loading branch information
@eagleivg
eagleivg committed Jun 9, 2018
1 parent 9f011fd commit 049d71c
Show file tree
Hide file tree
Showing 15 changed files with 110 additions and 105 deletions.
7 changes: 5 additions & 2 deletions src/xrAICore/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
)

#list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.cpp")
#list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
#foreach(header ${${PROJECT_NAME}__INCLUDES})
# if (${header} MATCHES _inline.h$)
# list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES ${header})
# endif()
#endforeach()

add_definitions(-DXRAICORE_EXPORTS -DAI_COMPILER -D_SECURE_SCL=0)
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
Expand Down
48 changes: 24 additions & 24 deletions src/xrAICore/Components/condition_state_inline.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ IC void CConditionStateAbstract::add_condition_back(const COperatorCondition& co
TEMPLATE_SPECIALIZATION
IC void CConditionStateAbstract::add_condition(const COperatorCondition& condition)
{
xr_vector<COperatorCondition>::iterator I = std::lower_bound(m_conditions.begin(), m_conditions.end(), condition);
typename xr_vector<COperatorCondition>::iterator I = std::lower_bound(m_conditions.begin(), m_conditions.end(), condition);
THROW((I == m_conditions.end()) || ((*I).condition() != condition.condition()));
m_conditions.insert(I, condition);
m_hash ^= condition.hash_value();
Expand All @@ -47,7 +47,7 @@ IC void CConditionStateAbstract::add_condition(const COperatorCondition& conditi
TEMPLATE_SPECIALIZATION
IC void CConditionStateAbstract::remove_condition(const typename COperatorCondition::_condition_type& condition)
{
xr_vector<COperatorCondition>::iterator I = std::lower_bound(
typename xr_vector<COperatorCondition>::iterator I = std::lower_bound(
m_conditions.begin(), m_conditions.end(), COperatorCondition(condition, COperatorCondition::_value_type(0)));
THROW((I != m_conditions.end()) && ((*I).condition() == condition));
m_hash ^= (*I).hash_value();
Expand All @@ -73,10 +73,10 @@ TEMPLATE_SPECIALIZATION
IC u8 CConditionStateAbstract::weight(const CConditionState& condition) const
{
u8 result = 0;
xr_vector<COperatorCondition>::const_iterator I = conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = conditions().end();
xr_vector<COperatorCondition>::const_iterator i = condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = condition.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator I = conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = condition.conditions().end();
for (; (I != E) && (i != e);)
if ((*I).condition() < (*i).condition())
++I;
Expand All @@ -95,10 +95,10 @@ IC u8 CConditionStateAbstract::weight(const CConditionState& condition) const
TEMPLATE_SPECIALIZATION
IC bool CConditionStateAbstract::operator<(const CConditionState& condition) const
{
xr_vector<COperatorCondition>::const_iterator I = conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = conditions().end();
xr_vector<COperatorCondition>::const_iterator i = condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = condition.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator I = conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = condition.conditions().end();
for (; (I != E) && (i != e); ++I, ++i)
if (*I < *i)
return (true);
Expand All @@ -118,10 +118,10 @@ IC bool CConditionStateAbstract::operator==(const CConditionState& condition) co
{
if (hash_value() != condition.hash_value())
return (false);
xr_vector<COperatorCondition>::const_iterator I = conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = conditions().end();
xr_vector<COperatorCondition>::const_iterator i = condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = condition.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator I = conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = condition.conditions().end();
for (; (I != E) && (i != e); ++I, ++i)
if (!(*I == *i))
return (false);
Expand All @@ -134,11 +134,11 @@ TEMPLATE_SPECIALIZATION
IC CConditionState<_world_property>& CConditionStateAbstract::operator-=(const CConditionState& condition)
{
m_hash = 0;
xr_vector<COperatorCondition> temp;
xr_vector<COperatorCondition>::const_iterator I = conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = conditions().end();
xr_vector<COperatorCondition>::const_iterator i = condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = condition.conditions().end();
xr_vector<COperatorCondition> temp;
typename xr_vector<COperatorCondition>::const_iterator I = conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = condition.conditions().end();
for (; (I != E) && (i != e);)
if ((*I).condition() < (*i).condition())
++I;
Expand All @@ -161,10 +161,10 @@ IC CConditionState<_world_property>& CConditionStateAbstract::operator-=(const C
TEMPLATE_SPECIALIZATION
IC bool CConditionStateAbstract::includes(const CConditionState& condition) const
{
xr_vector<COperatorCondition>::const_iterator I = conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = conditions().end();
xr_vector<COperatorCondition>::const_iterator i = condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = condition.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator I = conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = condition.conditions().end();
for (; (I != E) && (i != e);)
if ((*I).condition() < (*i).condition())
++I;
Expand All @@ -186,7 +186,7 @@ TEMPLATE_SPECIALIZATION
IC const typename CConditionStateAbstract::COperatorCondition* CConditionStateAbstract::property(
const typename CConditionStateAbstract::COperatorCondition::_condition_type& condition) const
{
xr_vector<COperatorCondition>::const_iterator I = std::lower_bound(
typename xr_vector<COperatorCondition>::const_iterator I = std::lower_bound(
conditions().begin(), conditions().end(), COperatorCondition(condition, COperatorCondition::_value_type(0)));
if (I == m_conditions.end())
return (0);
Expand Down
64 changes: 32 additions & 32 deletions src/xrAICore/Components/operator_abstract_inline.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ TEMPLATE_SPECIALIZATION
IC bool CAbstractOperator::applicable_reverse(
const CSConditionState& condition, const CSConditionState& start, const CSConditionState& self_condition) const
{
xr_vector<COperatorCondition>::const_iterator i = self_condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = self_condition.conditions().end();
xr_vector<COperatorCondition>::const_iterator I = condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = condition.conditions().end();
xr_vector<COperatorCondition>::const_iterator J = start.conditions().begin();
xr_vector<COperatorCondition>::const_iterator EE = start.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = self_condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = self_condition.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator I = condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = condition.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator J = start.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator EE = start.conditions().end();
for (; (I != E) && (i != e);)
if ((*I).condition() < (*i).condition())
++I;
Expand Down Expand Up @@ -142,12 +142,12 @@ IC bool CAbstractOperator::apply_reverse(const CSConditionState& condition, cons
{
result.clear();
bool changed = false;
xr_vector<COperatorCondition>::const_iterator i = self_condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = self_condition.conditions().end();
xr_vector<COperatorCondition>::const_iterator I = condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = condition.conditions().end();
xr_vector<COperatorCondition>::const_iterator J = start.conditions().begin();
xr_vector<COperatorCondition>::const_iterator EE = start.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = self_condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = self_condition.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator I = condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = condition.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator J = start.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator EE = start.conditions().end();
for (; (I != E) && (i != e);)
if ((*I).condition() < (*i).condition())
{
Expand Down Expand Up @@ -217,12 +217,12 @@ template <typename T>
IC bool CAbstractOperator::applicable(const CSConditionState& current, const CSConditionState& start,
const CSConditionState& conditions, T& problem_solver) const
{
xr_vector<COperatorCondition>::const_iterator I = current.conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = current.conditions().end();
xr_vector<COperatorCondition>::const_iterator i = conditions.conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = conditions.conditions().end();
xr_vector<COperatorCondition>::const_iterator II = start.conditions().begin();
xr_vector<COperatorCondition>::const_iterator EE = start.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator I = current.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = current.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = conditions.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = conditions.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator II = start.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator EE = start.conditions().end();
for (; (I != E) && (i != e);)
{
if ((*I).condition() < (*i).condition())
Expand Down Expand Up @@ -281,12 +281,12 @@ IC const typename CAbstractOperator::CSConditionState& CAbstractOperator::apply(
const CSConditionState& effects, CSConditionState& result, CSConditionState& start, T& problem_solver) const
{
result.clear();
xr_vector<COperatorCondition>::const_iterator I = current.conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = current.conditions().end();
xr_vector<COperatorCondition>::const_iterator i = effects.conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = effects.conditions().end();
xr_vector<COperatorCondition>::const_iterator II = start.conditions().begin();
xr_vector<COperatorCondition>::const_iterator EE = start.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator I = current.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = current.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = effects.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = effects.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator II = start.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator EE = start.conditions().end();
for (; (I != E) && (i != e);)
{
if ((*I).condition() < (*i).condition())
Expand Down Expand Up @@ -350,10 +350,10 @@ IC const typename CAbstractOperator::CSConditionState& CAbstractOperator::apply(
const CSConditionState& condition, const CSConditionState& self_condition, CSConditionState& result) const
{
result.clear();
xr_vector<COperatorCondition>::const_iterator i = self_condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = self_condition.conditions().end();
xr_vector<COperatorCondition>::const_iterator I = condition.conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = condition.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = self_condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = self_condition.conditions().end();
typename xr_vector<COperatorCondition>::const_iterator I = condition.conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = condition.conditions().end();
for (; (I != E) && (i != e);)
if ((*I).condition() < (*i).condition())
{
Expand Down Expand Up @@ -401,10 +401,10 @@ IC typename CAbstractOperator::_edge_value_type CAbstractOperator::min_weight()
return (m_min_weight);

m_min_weight = 0;
xr_vector<COperatorCondition>::const_iterator I = conditions().conditions().begin();
xr_vector<COperatorCondition>::const_iterator E = conditions().conditions().end();
xr_vector<COperatorCondition>::const_iterator i = effects().conditions().begin();
xr_vector<COperatorCondition>::const_iterator e = effects().conditions().end();
typename xr_vector<COperatorCondition>::const_iterator I = conditions().conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator E = conditions().conditions().end();
typename xr_vector<COperatorCondition>::const_iterator i = effects().conditions().begin();
typename xr_vector<COperatorCondition>::const_iterator e = effects().conditions().end();
for (; (i != e) && (I != E);)
{
if ((*I).condition() < (*i).condition())
Expand Down
18 changes: 10 additions & 8 deletions src/xrAICore/Components/problem_solver.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ class CProblemSolver
typedef _operator COperator;
typedef _condition_state CState;
typedef _condition_evaluator CConditionEvaluator;
#ifdef WINDOWS
typedef _operator_ptr _operator_ptr;
typedef _condition_evaluator_ptr _condition_evaluator_ptr;
#endif
typedef typename _operator_condition::_condition_type _condition_type;
typedef typename _operator_condition::_value_type _value_type;
typedef typename _operator::_edge_value_type _edge_value_type;
Expand All @@ -47,8 +49,8 @@ class CProblemSolver
_operator_id_type m_operator_id;
_operator_ptr m_operator;

IC SOperator(const _operator_id_type& operator_id, _operator_ptr _operator)
: m_operator_id(operator_id), m_operator(_operator)
IC SOperator(const _operator_id_type& operator_id, _operator_ptr _op)
: m_operator_id(operator_id), m_operator(_op)
{
}

Expand All @@ -72,13 +74,13 @@ class CProblemSolver
bool m_failed;

private:
template <bool>
IC bool is_goal_reached_impl(const _index_type& vertex_index) const
template <bool a>
IC bool is_goal_reached_impl(std::enable_if_t<!a, const _index_type&> vertex_index) const
{
return is_goal_reached_impl(vertex_index);
}
template <>
IC bool is_goal_reached_impl<true>(const _index_type& vertex_index) const
template <bool a>
IC bool is_goal_reached_impl(std::enable_if_t<a, const _index_type&> vertex_index) const
{
return is_goal_reached_impl(vertex_index, true);
}
Expand Down Expand Up @@ -131,9 +133,9 @@ class CProblemSolver
IC _edge_value_type estimate_edge_weight(const _index_type& vertex_index) const;

// operator interface
IC virtual void add_operator(const _edge_type& operator_id, _operator_ptr _operator);
IC virtual void add_operator(const _edge_type& operator_id, _operator_ptr _op);
IC virtual void remove_operator(const _edge_type& operator_id);
IC _operator_ptr get_operator(const _operator_id_type& operator_id);
IC _operator_ptr get_operator(const _edge_type& operator_id);
IC const OPERATOR_VECTOR& operators() const;

// state interface
Expand Down
Loading

0 comments on commit 049d71c

Please sign in to comment.