diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-09-01 10:05:39 -0700 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-09-01 10:05:39 -0700 |
| commit | cd113666902b5b0b0f09eba005a25da01946bdc9 (patch) | |
| tree | a723872e91be7528cba92b615274c412ee417ef0 /src/server/game | |
| parent | 582686090d4c5f5b0d9a59648e63ca01b2888e0f (diff) | |
| parent | e1e1067d172f9b1a6ba770ca6ae53a07dbc9d56f (diff) | |
Merge pull request #10694 from jackpoz/loopcounter_race_condition
Core/Thread: Fix race condition in FreezeDetectorRunnable
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/World/World.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 2bc4f3a0258..12ec033dfa7 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -83,7 +83,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, bool> World::m_stopEvent = false; uint8 World::m_ExitCode = SHUTDOWN_EXIT_CODE; -volatile uint32 World::m_worldLoopCounter = 0; +ACE_Atomic_Op<ACE_Thread_Mutex, uint32> World::m_worldLoopCounter = 0; float World::m_MaxVisibleDistanceOnContinents = DEFAULT_VISIBILITY_DISTANCE; float World::m_MaxVisibleDistanceInInstances = DEFAULT_VISIBILITY_INSTANCE; diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index bf90b5ac01a..d4d9c4e2431 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -514,7 +514,7 @@ struct CharacterNameData class World { public: - static volatile uint32 m_worldLoopCounter; + static ACE_Atomic_Op<ACE_Thread_Mutex, uint32> m_worldLoopCounter; World(); ~World(); |