summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYehonal <yehonal.azeroth@gmail.com>2016-09-04 14:39:59 +0200
committerYehonal <yehonal.azeroth@gmail.com>2016-09-04 14:39:59 +0200
commit3db4c1717b5962e93a364dce37f1ca1a21b9bac5 (patch)
tree7b0ea7615bb3a9097eb875de1438890792d2ff93 /src
parent1f751abf2506cea6cad24fe368f12e6a8ad602d0 (diff)
Fixed compilation for vs 2013
Diffstat (limited to 'src')
-rw-r--r--src/game/Scripting/ScriptMgr.h2
-rw-r--r--src/game/Server/WorldSocketMgr.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Scripting/ScriptMgr.h b/src/game/Scripting/ScriptMgr.h
index 878d16d594..f359251055 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<long> _scheduledScripts;
};
template<class TScript>
diff --git a/src/game/Server/WorldSocketMgr.cpp b/src/game/Server/WorldSocketMgr.cpp
index 0c2ea1f07e..f4f8ad9725 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<int> AtomicInt;
typedef std::set<WorldSocket*> SocketSet;
ACE_Reactor* m_Reactor;