From 3db4c1717b5962e93a364dce37f1ca1a21b9bac5 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Sun, 4 Sep 2016 14:39:59 +0200 Subject: [PATCH] Fixed compilation for vs 2013 --- src/game/Scripting/ScriptMgr.h | 2 +- src/game/Server/WorldSocketMgr.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/Scripting/ScriptMgr.h b/src/game/Scripting/ScriptMgr.h index 878d16d59..f35925105 100644 --- a/src/game/Scripting/ScriptMgr.h +++ b/src/game/Scripting/ScriptMgr.h @@ -1088,7 +1088,7 @@ class ScriptMgr uint32 _scriptCount; //atomic op counter for active scripts amount - std::atomic_long _scheduledScripts; + std::atomic _scheduledScripts; }; template diff --git a/src/game/Server/WorldSocketMgr.cpp b/src/game/Server/WorldSocketMgr.cpp index 0c2ea1f07..f4f8ad972 100644 --- a/src/game/Server/WorldSocketMgr.cpp +++ b/src/game/Server/WorldSocketMgr.cpp @@ -186,7 +186,7 @@ class ReactorRunnable : protected ACE_Task_Base } private: - typedef std::atomic_long AtomicInt; + typedef std::atomic AtomicInt; typedef std::set SocketSet; ACE_Reactor* m_Reactor;