diff options
| author | leak <leak@bitmx.net> | 2014-07-01 00:54:09 +0200 |
|---|---|---|
| committer | leak <leak@bitmx.net> | 2014-07-01 00:54:09 +0200 |
| commit | 029bad6698df6ac9556fe308342e616f4a7a8cc7 (patch) | |
| tree | 01142dad7e748aba7799b9c296ccc4cf11db886f /src/server/game/Server/Protocol | |
| parent | d39a013b6b979a5158bf86c37a197cb902b2c2f9 (diff) | |
Replaced all remaining ACE based Singletons
Replaced ACE base AutoPtr class with shared_ptr
Note: worldserver currently broken due to MapUpdater threading failure (ACE ofc, what else could it be)
Diffstat (limited to 'src/server/game/Server/Protocol')
| -rw-r--r-- | src/server/game/Server/Protocol/PacketLog.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/server/game/Server/Protocol/PacketLog.h b/src/server/game/Server/Protocol/PacketLog.h index 9c60655e627..71d87bf45ae 100644 --- a/src/server/game/Server/Protocol/PacketLog.h +++ b/src/server/game/Server/Protocol/PacketLog.h @@ -19,7 +19,6 @@ #define TRINITY_PACKETLOG_H #include "Common.h" -#include <ace/Singleton.h> enum Direction { @@ -31,13 +30,17 @@ class WorldPacket; class PacketLog { - friend class ACE_Singleton<PacketLog, ACE_Thread_Mutex>; - private: PacketLog(); ~PacketLog(); public: + static PacketLog* instance() + { + static PacketLog* instance = new PacketLog(); + return instance; + } + void Initialize(); bool CanLogPacket() const { return (_file != NULL); } void LogPacket(WorldPacket const& packet, Direction direction); @@ -46,5 +49,5 @@ class PacketLog FILE* _file; }; -#define sPacketLog ACE_Singleton<PacketLog, ACE_Thread_Mutex>::instance() +#define sPacketLog PacketLog::instance() #endif |