nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-24 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Misc): remove and replace ACE_Singleton (#2418)

Browse Source
This commit is contained in:
Kargatum
2019-12-21 00:29:29 +07:00
committed by GitHub
parent 16b45bf334
commit 4a8f1de538
88 changed files with 486 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Calendar/CalendarMgr.cpp
View File

@@ -34,6 +34,12 @@ CalendarMgr::~CalendarMgr()
delete *itr2;
}
CalendarMgr* CalendarMgr::instance()
{
static CalendarMgr instance;
return &instance;
}
void CalendarMgr::LoadFromDB()
{
uint32 count = 0;

7
src/server/game/Calendar/CalendarMgr.h
View File

@@ -7,7 +7,6 @@
#ifndef ACORE_CALENDARMGR_H
#define ACORE_CALENDARMGR_H
#include <ace/Singleton.h>
#include "Common.h"
#include "DatabaseEnv.h"
#include "WorldPacket.h"
@@ -257,8 +256,6 @@ typedef std::unordered_map<uint64 /* eventId */, CalendarInviteStore > CalendarE
class CalendarMgr
{
friend class ACE_Singleton<CalendarMgr, ACE_Null_Mutex>;
private:
CalendarMgr();
~CalendarMgr();
@@ -272,6 +269,8 @@ class CalendarMgr
uint64 _maxInviteId;
public:
static CalendarMgr* instance();
void LoadFromDB();
CalendarEvent* GetEvent(uint64 eventId, CalendarEventStore::iterator* it = NULL);
@@ -318,6 +317,6 @@ class CalendarMgr
void SendPacketToAllEventRelatives(WorldPacket packet, CalendarEvent const& calendarEvent);
};
#define sCalendarMgr ACE_Singleton<CalendarMgr, ACE_Null_Mutex>::instance()
#define sCalendarMgr CalendarMgr::instance()
#endif