aboutsummaryrefslogtreecommitdiff
path: root/src/game/MapManager.h
diff options
context:
space:
mode:
authorRat <none@none>2009-12-20 15:20:04 +0100
committerRat <none@none>2009-12-20 15:20:04 +0100
commit6fe36efe0f2a05421965ad57c69b2f950a2cdb72 (patch)
treed8377347f5ae67a042d37b52b4eabf2bd4aa32bf /src/game/MapManager.h
parentbaa264e6150700e54a9ba6995d16a6d5af2c0dee (diff)
*apply trinity style to whole source
*comment out all mangos to trinity defines *this will make merging a little harder, but code will be more clear --HG-- branch : trunk
Diffstat (limited to 'src/game/MapManager.h')
-rw-r--r--src/game/MapManager.h4
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;