Merge pull request #273 from FreeZoneMods/xd_dev

fix event notifier for Linux build

Author: Xottab-DUTY

src/xrCore/Events/Notifier.h

@@ -13,6 +13,9 @@
 #include "xrCore/Threading/Lock.hpp"
 #include "xrCore/Threading/ScopeLock.hpp"
 
+#include <limits>
+#include <algorithm>
+
 /*!
     \brief Base abstract class for implementing event handling callbacks
 
@@ -49,7 +52,7 @@ class CEventNotifierCallbackWithCid : public CEventNotifierCallback
     /*! Constructor, takes callback ID which was generated by the notifier
         /param[in] cid callback ID, should be generated by the notifier in subscription process only
     */
-    CEventNotifierCallbackWithCid(CID cid) : m_cid(cid), CEventNotifierCallback(){};
+    CEventNotifierCallbackWithCid(CID cid) : CEventNotifierCallback(), m_cid(cid){};
 
     /*! Returns the callback ID which was generated by the notifier and passed to the constructor */
     CID GetCid() const { return m_cid; }
@@ -87,7 +90,7 @@ class CEventNotifier
         CEventNotifierCallback::CID FindFreeCid()
         {
             ScopeLock lock(&m_lock);
-            auto it = std::find(m_callbacks.begin(), m_callbacks.end(), nullptr);
+            auto it = std::find(m_callbacks.begin(), m_callbacks.end(), static_cast<CEventNotifierCallback*>(nullptr));
             return (it == m_callbacks.end()) ? CEventNotifierCallback::INVALID_CID :
                                                std::distance(m_callbacks.begin(), it);
         }
@@ -96,7 +99,7 @@ class CEventNotifier
         CEventNotifierCallback::CID RegisterCallback(CEventNotifierCallback* cb)
         {
             ScopeLock lock(&m_lock);
-            auto it = std::find(m_callbacks.begin(), m_callbacks.end(), nullptr);
+            auto it = std::find(m_callbacks.begin(), m_callbacks.end(), static_cast<CEventNotifierCallback*>(nullptr));
             return (it == m_callbacks.end()) ? (m_callbacks.emplace_back(cb), m_callbacks.size() - 1) :
                                                (it->callback.reset(cb), std::distance(m_callbacks.begin(), it));
         }
@@ -203,7 +206,7 @@ class CEventNotifier
     CEventNotifierCallback::CID CreateRegisteredCallback(unsigned int event_id, Args&&... args)
     {
         R_ASSERT(event_id < CNT);
-        return m_callbacks[event_id].CreateRegisteredCallback<CB>(args...);
+        return m_callbacks[event_id].template CreateRegisteredCallback<CB>(args...);
     }
 
     /*! \brief Provides the way to unsubscribe and delete the callback

src/xrGame/MainMenu.cpp

@@ -76,7 +76,7 @@ CMainMenu::CMainMenu()
         void ProcessEvent() override { m_mainmenu->DestroyInternal(true); }
     };
 
-    m_script_reset_event_cid = ai().Subscribe<CResetEventCb>(CAI_Space::EVENT_SCRIPT_ENGINE_RESET, this);
+    m_script_reset_event_cid = ai().template Subscribe<CResetEventCb>(CAI_Space::EVENT_SCRIPT_ENGINE_RESET, this);
 
     m_Flags.zero();
     m_startDialog = NULL;

src/xrGame/ai_space.h

@@ -76,7 +76,7 @@ class CAI_Space : public AISpaceBase
     template <class CB, class... Args>
     CEventNotifierCallback::CID Subscribe(EEventID event_id, Args&&... args)
     {
-        return m_events_notifier.CreateRegisteredCallback<CB>(event_id, args...);
+        return m_events_notifier.template CreateRegisteredCallback<CB>(event_id, args...);
     }
 
     bool Unsubscribe(CEventNotifierCallback::CID cid, EEventID event_id);

src/xrGame/ui/UIWpnParams.cpp

@@ -120,7 +120,7 @@ void CUIWpnParams::SetInfo(CInventoryItem* slot_wpn, CInventoryItem& cur_wpn)
         };
 
         g_lua_wpn_params = new SLuaWpnParams();
-        ai().Subscribe<CResetEventCb>(CAI_Space::EVENT_SCRIPT_ENGINE_RESET);
+        ai().template Subscribe<CResetEventCb>(CAI_Space::EVENT_SCRIPT_ENGINE_RESET);
     }
 
     LPCSTR cur_section = cur_wpn.object().cNameSect().c_str();

src/xrServerEntities/object_factory_inline.h

@@ -30,7 +30,7 @@ IC const CObjectFactory& object_factory()
             }
         };
 
-        ai().Subscribe<CResetEventCb>(CAI_Space::EVENT_SCRIPT_ENGINE_RESET);
+        ai().template Subscribe<CResetEventCb>(CAI_Space::EVENT_SCRIPT_ENGINE_RESET);
     }
     return (*g_object_factory);
 }