diff options
| author | n0n4m3 <none@none> | 2009-12-20 17:39:36 +0100 |
|---|---|---|
| committer | n0n4m3 <none@none> | 2009-12-20 17:39:36 +0100 |
| commit | cc19e731742420615bc7c68144b100b07298fad0 (patch) | |
| tree | f382525179450cb425c4ad9cf3d6444a4cee1f93 /src/game/MapManager.h | |
| parent | 851a514f90355d00661b2fd60853ed4623b4b26a (diff) | |
| parent | a85544cb9c51e412169afe82a63cec602f71b1bd (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/MapManager.h')
| -rw-r--r-- | src/game/MapManager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/MapManager.h b/src/game/MapManager.h index df90add4d57..3be92a35a9f 100644 --- a/src/game/MapManager.h +++ b/src/game/MapManager.h @@ -33,7 +33,7 @@ class Transport; #define DEFAULT_VISIBILITY_NOTIFY_PERIOD 1000 -class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::ClassLevelLockable<MapManager, ACE_Thread_Mutex> > +class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinity::ClassLevelLockable<MapManager, ACE_Thread_Mutex> > { friend class Trinity::OperatorNew<MapManager>; @@ -149,7 +149,7 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS:: return (iter == i_maps.end() ? NULL : iter->second); } - typedef MaNGOS::ClassLevelLockable<MapManager, ACE_Thread_Mutex>::Lock Guard; + typedef Trinity::ClassLevelLockable<MapManager, ACE_Thread_Mutex>::Lock Guard; uint32 i_gridCleanUpDelay; MapMapType i_maps; IntervalTimer i_timer; |