diff options
author | Naios <naios-dev@live.de> | 2016-03-11 16:10:47 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2016-03-11 18:25:55 +0100 |
commit | a8fe7f6eb7195368bbb4d0256927405f5e5c6f87 (patch) | |
tree | 66d6ff9ca11d60010cb8a73b49dc09d33a829959 /src/server/worldserver/Main.cpp | |
parent | 30517cb1d3b27d5abb8632d863797aa5749199a6 (diff) |
Core/Database: Move singleton instances into compilation units
* Fixes issues when building shared libraries
(prevents gcc and clang from providing several instance)
* Also instantiate the database worker pools in DatabaseEnv.cpp now.
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rw-r--r-- | src/server/worldserver/Main.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 906937e974b..45bea2ad636 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -80,10 +80,6 @@ uint32 _worldLoopCounter(0); uint32 _lastChangeMsTime(0); uint32 _maxCoreStuckTimeInMs(0); -WorldDatabaseWorkerPool WorldDatabase; ///< Accessor to the world database -CharacterDatabaseWorkerPool CharacterDatabase; ///< Accessor to the character database -HotfixDatabaseWorkerPool HotfixDatabase; ///< Accessor to the hotfix database -LoginDatabaseWorkerPool LoginDatabase; ///< Accessor to the realm/login database Realm realm; void SignalHandler(const boost::system::error_code& error, int signalNumber); |