xrGame: add missing typename for linux build

OpenXRay · Aug 13, 2018 · a5eb38d · a5eb38d
1 parent 444d0e1
commit a5eb38d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
@@ -187,6 +187,7 @@ typedef long LONG_PTR;
 
 typedef int HANDLE;
 typedef void* HMODULE;
+typedef void* PVOID;
 typedef void* LPVOID;
 typedef UINT_PTR WPARAM;
 typedef LONG_PTR LPARAM;

diff --git a/src/xrGame/CMakeLists.txt b/src/xrGame/CMakeLists.txt
@@ -5,6 +5,7 @@ list(APPEND DIRS
     "ai"
     "ik"
     "ui"
+    "../xrServerEntities"
     )
 
 add_dir("${DIRS}")

diff --git a/src/xrGame/ini_table_loader.h b/src/xrGame/ini_table_loader.h
@@ -108,7 +108,7 @@ typename CSIni_Table::ITEM_TABLE& CSIni_Table::table()
 
     for (auto i = table_ini.Data.cbegin(); table_ini.Data.cend() != i; ++i)
     {
-        T_INI_LOADER::index_type cur_index = T_INI_LOADER::IdToIndex((*i).first, type_max<T_INI_LOADER::index_type>);
+        typename T_INI_LOADER::index_type cur_index = T_INI_LOADER::IdToIndex((*i).first, type_max<T_INI_LOADER::index_type>);
 
         if (type_max<T_INI_LOADER::index_type> == cur_index)
             xrDebug::Fatal(DEBUG_INFO, "wrong community %s in section [%s]", (*i).first, table_sect);

diff --git a/src/xrGame/memory_manager_inline.h b/src/xrGame/memory_manager_inline.h
@@ -11,8 +11,8 @@
 template <typename T, typename _predicate>
 IC void CMemoryManager::fill_enemies(const xr_vector<T>& objects, const _predicate& predicate) const
 {
-    xr_vector<T>::const_iterator I = objects.begin();
-    xr_vector<T>::const_iterator E = objects.end();
+    typename xr_vector<T>::const_iterator I = objects.begin();
+    typename xr_vector<T>::const_iterator E = objects.end();
     for (; I != E; ++I)
     {
         if (!(*I).m_enabled)

diff --git a/src/xrGame/object_manager_inline.h b/src/xrGame/object_manager_inline.h
@@ -38,8 +38,8 @@ void CAbstractObjectManager::update()
 {
     float result = flt_max;
     m_selected = 0;
-    OBJECTS::const_iterator I = m_objects.begin();
-    OBJECTS::const_iterator E = m_objects.end();
+    typename OBJECTS::const_iterator I = m_objects.begin();
+    typename OBJECTS::const_iterator E = m_objects.end();
     for (; I != E; ++I)
     {
         float value = do_evaluate(*I);
@@ -72,7 +72,7 @@ bool CAbstractObjectManager::add(T* object)
     if (!is_useful(object))
         return (false);
 
-    OBJECTS::const_iterator I = std::find(m_objects.begin(), m_objects.end(), object);
+    typename OBJECTS::const_iterator I = std::find(m_objects.begin(), m_objects.end(), object);
     if (m_objects.end() == I)
     {
         m_objects.push_back(object);

diff --git a/src/xrGame/setup_manager_inline.h b/src/xrGame/setup_manager_inline.h
@@ -31,7 +31,7 @@ void CSSetupManager::reinit()
 TEMPLATE_SPECIALIZATION
 IC _action_type& CSSetupManager::action(const _action_id_type& action_id) const
 {
-    setup_actions::const_iterator I = std::find_if(actions().begin(), actions().end(), setup_pred(action_id));
+    typename setup_actions::const_iterator I = std::find_if(actions().begin(), actions().end(), setup_pred(action_id));
     VERIFY(I != actions().end());
     return (*(*I).second);
 }
@@ -93,8 +93,8 @@ IC void CSSetupManager::select_action()
         }
 
         float m_total_weight = 0.f;
-        setup_actions::const_iterator I = actions().begin();
-        setup_actions::const_iterator E = actions().end();
+        typename setup_actions::const_iterator I = actions().begin();
+        typename setup_actions::const_iterator E = actions().end();
         for (; I != E; ++I)
             if (((*I).first != m_current_action_id) && (*I).second->applicable())
                 m_total_weight += (*I).second->weight();

diff --git a/src/xrGame/ui/UIOptionsItem.h b/src/xrGame/ui/UIOptionsItem.h
@@ -25,11 +25,11 @@ class CUIOptionsItem
     static CUIOptionsManager* GetOptionsManager() { return &m_optionsManager; }
     virtual void OnMessage(LPCSTR message);
 
-    virtual void SetCurrentOptValue() = 0 {}; // opt->current
-    virtual void SaveBackUpOptValue() = 0 {}; // current->backup
+    virtual void SetCurrentOptValue() = 0; // opt->current
+    virtual void SaveBackUpOptValue() = 0; // current->backup
     virtual void SaveOptValue() = 0; // current->opt
     virtual void UndoOptValue() = 0; // backup->current
-    virtual bool IsChangedOptValue() const = 0 {}; // backup!=current
+    virtual bool IsChangedOptValue() const = 0; // backup!=current
     void OnChangedOptValue();
 
 protected: