diff options
| author | Naios <naios-dev@live.de> | 2016-03-11 19:27:22 +0100 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-03-11 19:51:07 +0100 |
| commit | 3a4ec8bcbee91e2ad03d4f9e421f45df14b1acac (patch) | |
| tree | ca99046e3041dd10d5a3322d63d91aa01f087854 /src/server/worldserver/Main.cpp | |
| parent | fbe724fab9cc1504ff4f6ac362ce0d189b6f51fe (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.
(cherry picked from commit a8fe7f6eb7195368bbb4d0256927405f5e5c6f87)
Diffstat (limited to 'src/server/worldserver/Main.cpp')
| -rw-r--r-- | src/server/worldserver/Main.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 007a58ced79..2cb66b4dc2b 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -78,9 +78,6 @@ uint32 _worldLoopCounter(0); uint32 _lastChangeMsTime(0); uint32 _maxCoreStuckTimeInMs(0); -WorldDatabaseWorkerPool WorldDatabase; ///< Accessor to the world database -CharacterDatabaseWorkerPool CharacterDatabase; ///< Accessor to the character database -LoginDatabaseWorkerPool LoginDatabase; ///< Accessor to the realm/login database Realm realm; void SignalHandler(const boost::system::error_code& error, int signalNumber); |