From 3a4ec8bcbee91e2ad03d4f9e421f45df14b1acac Mon Sep 17 00:00:00 2001 From: Naios Date: Fri, 11 Mar 2016 19:27:22 +0100 Subject: 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) --- src/server/worldserver/Main.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/server/worldserver/Main.cpp') 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); -- cgit v1.2.3