diff options
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/Configuration/Config.h | 4 | ||||
| -rw-r--r-- | src/server/shared/Dynamic/ObjectRegistry.h | 4 | ||||
| -rw-r--r-- | src/server/shared/Logging/Log.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h index 68daca5440f..42c3a700f3f 100644 --- a/src/server/shared/Configuration/Config.h +++ b/src/server/shared/Configuration/Config.h @@ -35,8 +35,8 @@ public: static ConfigMgr* instance() { - static ConfigMgr *instance = new ConfigMgr(); - return instance; + static ConfigMgr instance; + return &instance; } bool Reload(); diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index e9e57415073..fe55982f15f 100644 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -35,8 +35,8 @@ class ObjectRegistry static ObjectRegistry<T, Key>* instance() { - static ObjectRegistry<T, Key>* instance = new ObjectRegistry<T, Key>(); - return instance; + static ObjectRegistry<T, Key> instance; + return &instance; } /// Returns a registry item diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h index e739c9eaf4e..8ae8db5bf5f 100644 --- a/src/server/shared/Logging/Log.h +++ b/src/server/shared/Logging/Log.h @@ -43,15 +43,15 @@ class Log static Log* instance(boost::asio::io_service* ioService = nullptr) { - static Log* instance = new Log(); + static Log instance; if (ioService != nullptr) { - instance->_ioService = ioService; - instance->_strand = new boost::asio::strand(*ioService); + instance._ioService = ioService; + instance._strand = new boost::asio::strand(*ioService); } - return instance; + return &instance; } void LoadFromConfig(); |