Skip to content

Commit

Permalink
xrGame: Other minor fixes for GCC
Browse files Browse the repository at this point in the history
  • Loading branch information
Zegeri committed Sep 16, 2018
1 parent d5d013d commit 8971a83
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/xrAICore/Components/problem_solver_inline.h
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ TEMPLATE_SPECIALIZATION
IC typename CProblemSolverAbstract::edge_value_type CProblemSolverAbstract::estimate_edge_weight(
const _index_type& condition) const
{
return (helper::estimate_edge_weight_impl<reverse_search>(*this, condition));
return (helper::template estimate_edge_weight_impl<reverse_search>(*this, condition));
}

TEMPLATE_SPECIALIZATION
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/ContextMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CContextMenu::~CContextMenu()
void CContextMenu::Load(CInifile* INI, LPCSTR SECT)
{
CInifile::Sect& S = INI->r_section(SECT);
for (CInifile::SectCIt I = S.Data.begin(); S.Data.end() != I; ++I)
for (auto I = S.Data.begin(); S.Data.end() != I; ++I)
{
char Event[128], Param[128];
Event[0] = 0;
Expand Down
12 changes: 6 additions & 6 deletions src/xrGame/agent_enemy_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

const float wounded_enemy_reached_distance = 3.f;

const unsigned __int32 __c0 = 0x55555555;
const unsigned __int32 __c1 = 0x33333333;
const unsigned __int32 __c2 = 0x0f0f0f0f;
const unsigned __int32 __c3 = 0x00ff00ff;
const unsigned __int32 __c4 = 0x0000003f;
const u32 __c0 = 0x55555555;
const u32 __c1 = 0x33333333;
const u32 __c2 = 0x0f0f0f0f;
const u32 __c3 = 0x00ff00ff;
const u32 __c4 = 0x0000003f;

IC u32 population(const u32& b)
{
Expand Down Expand Up @@ -394,7 +394,7 @@ template <typename T>
IC void CAgentEnemyManager::setup_mask(
xr_vector<T>& objects, CMemberEnemy& enemy, const squad_mask_type& non_combat_members)
{
xr_vector<T>::iterator I = std::find(objects.begin(), objects.end(), enemy.m_object->ID());
auto I = std::find(objects.begin(), objects.end(), enemy.m_object->ID());
if (I != objects.end())
{
(*I).m_squad_mask.assign((*I).m_squad_mask.get() | enemy.m_distribute_mask.get());
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/doors.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace doors
class door;
typedef xr_vector<door*> doors_type;

enum door_state
enum door_state : int
{
door_state_open,
door_state_closed,
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/doors_door.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class CPhysicObject;
namespace doors
{
class actor;
enum door_state;
enum door_state : int;

class door : private Noncopyable
{
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/queued_async_method.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ struct parameters_tuple3
{
parameters_tuple3() {}
parameters_tuple3(T1 t1, T2 t2, T3 t3) : m_t1(t1), m_t2(t2), m_t3(t3){};
parameters_tuple3(parameters_tuple3 const& copy) : m_t1(copy.m_t1), m_t2(copy.m_t2), m_t3(copt.m_t3){};
parameters_tuple3(parameters_tuple3 const& copy) : m_t1(copy.m_t1), m_t2(copy.m_t2), m_t3(copy.m_t3){};

parameters_tuple3& operator=(parameters_tuple3 const& copy)
{
Expand Down Expand Up @@ -165,7 +165,7 @@ struct parameters_tuple4
return *this;
}

bool operator==(parameters_tuple3 const& right) const
bool operator==(parameters_tuple4 const& right) const
{
return (m_t1 == right.m_t1) && (m_t2 == right.m_t2) && (m_t3 == right.m_t3) && (m_t4 == right.m_t4);
}
Expand Down
3 changes: 1 addition & 2 deletions src/xrGame/space_restriction_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include "space_restriction_holder.h"
#include "alife_space.h"
#include "space_restriction.h"

namespace RestrictionSpace
{
Expand All @@ -19,8 +20,6 @@ struct CTimeIntrusiveBase;
template <typename _1, typename _2>
class intrusive_ptr;

class CSpaceRestriction;

class CSpaceRestrictionManager : public CSpaceRestrictionHolder
{
friend class LevelGraphDebugRender;
Expand Down

0 comments on commit 8971a83

Please sign in to comment.