Skip to content

Commit a5eb38d

Browse files
committed
xrGame: add missing typename for linux build
1 parent 444d0e1 commit a5eb38d

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

src/Common/PlatformLinux.inl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ typedef long LONG_PTR;
187187

188188
typedef int HANDLE;
189189
typedef void* HMODULE;
190+
typedef void* PVOID;
190191
typedef void* LPVOID;
191192
typedef UINT_PTR WPARAM;
192193
typedef LONG_PTR LPARAM;

src/xrGame/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ list(APPEND DIRS
55
"ai"
66
"ik"
77
"ui"
8+
"../xrServerEntities"
89
)
910

1011
add_dir("${DIRS}")

src/xrGame/ini_table_loader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ typename CSIni_Table::ITEM_TABLE& CSIni_Table::table()
108108

109109
for (auto i = table_ini.Data.cbegin(); table_ini.Data.cend() != i; ++i)
110110
{
111-
T_INI_LOADER::index_type cur_index = T_INI_LOADER::IdToIndex((*i).first, type_max<T_INI_LOADER::index_type>);
111+
typename T_INI_LOADER::index_type cur_index = T_INI_LOADER::IdToIndex((*i).first, type_max<T_INI_LOADER::index_type>);
112112

113113
if (type_max<T_INI_LOADER::index_type> == cur_index)
114114
xrDebug::Fatal(DEBUG_INFO, "wrong community %s in section [%s]", (*i).first, table_sect);

src/xrGame/memory_manager_inline.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
template <typename T, typename _predicate>
1212
IC void CMemoryManager::fill_enemies(const xr_vector<T>& objects, const _predicate& predicate) const
1313
{
14-
xr_vector<T>::const_iterator I = objects.begin();
15-
xr_vector<T>::const_iterator E = objects.end();
14+
typename xr_vector<T>::const_iterator I = objects.begin();
15+
typename xr_vector<T>::const_iterator E = objects.end();
1616
for (; I != E; ++I)
1717
{
1818
if (!(*I).m_enabled)

src/xrGame/object_manager_inline.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ void CAbstractObjectManager::update()
3838
{
3939
float result = flt_max;
4040
m_selected = 0;
41-
OBJECTS::const_iterator I = m_objects.begin();
42-
OBJECTS::const_iterator E = m_objects.end();
41+
typename OBJECTS::const_iterator I = m_objects.begin();
42+
typename OBJECTS::const_iterator E = m_objects.end();
4343
for (; I != E; ++I)
4444
{
4545
float value = do_evaluate(*I);
@@ -72,7 +72,7 @@ bool CAbstractObjectManager::add(T* object)
7272
if (!is_useful(object))
7373
return (false);
7474

75-
OBJECTS::const_iterator I = std::find(m_objects.begin(), m_objects.end(), object);
75+
typename OBJECTS::const_iterator I = std::find(m_objects.begin(), m_objects.end(), object);
7676
if (m_objects.end() == I)
7777
{
7878
m_objects.push_back(object);

src/xrGame/setup_manager_inline.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void CSSetupManager::reinit()
3131
TEMPLATE_SPECIALIZATION
3232
IC _action_type& CSSetupManager::action(const _action_id_type& action_id) const
3333
{
34-
setup_actions::const_iterator I = std::find_if(actions().begin(), actions().end(), setup_pred(action_id));
34+
typename setup_actions::const_iterator I = std::find_if(actions().begin(), actions().end(), setup_pred(action_id));
3535
VERIFY(I != actions().end());
3636
return (*(*I).second);
3737
}
@@ -93,8 +93,8 @@ IC void CSSetupManager::select_action()
9393
}
9494

9595
float m_total_weight = 0.f;
96-
setup_actions::const_iterator I = actions().begin();
97-
setup_actions::const_iterator E = actions().end();
96+
typename setup_actions::const_iterator I = actions().begin();
97+
typename setup_actions::const_iterator E = actions().end();
9898
for (; I != E; ++I)
9999
if (((*I).first != m_current_action_id) && (*I).second->applicable())
100100
m_total_weight += (*I).second->weight();

src/xrGame/ui/UIOptionsItem.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ class CUIOptionsItem
2525
static CUIOptionsManager* GetOptionsManager() { return &m_optionsManager; }
2626
virtual void OnMessage(LPCSTR message);
2727

28-
virtual void SetCurrentOptValue() = 0 {}; // opt->current
29-
virtual void SaveBackUpOptValue() = 0 {}; // current->backup
28+
virtual void SetCurrentOptValue() = 0; // opt->current
29+
virtual void SaveBackUpOptValue() = 0; // current->backup
3030
virtual void SaveOptValue() = 0; // current->opt
3131
virtual void UndoOptValue() = 0; // backup->current
32-
virtual bool IsChangedOptValue() const = 0 {}; // backup!=current
32+
virtual bool IsChangedOptValue() const = 0; // backup!=current
3333
void OnChangedOptValue();
3434

3535
protected:

0 commit comments

Comments
 (0)