From a8fe7f6eb7195368bbb4d0256927405f5e5c6f87 Mon Sep 17 00:00:00 2001 From: Naios Date: Fri, 11 Mar 2016 16:10:47 +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. --- src/server/worldserver/CMakeLists.txt | 1 + src/server/worldserver/Main.cpp | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/server/worldserver') diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 1c7bfadddde..af30600fc09 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -65,6 +65,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/database/ ${CMAKE_SOURCE_DIR}/src/server/database/Database ${CMAKE_SOURCE_DIR}/src/server/database/Logging + ${CMAKE_SOURCE_DIR}/src/server/database/Updater ${CMAKE_SOURCE_DIR}/src/server/game ${CMAKE_SOURCE_DIR}/src/server/game/Accounts ${CMAKE_SOURCE_DIR}/src/server/game/Addons 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); -- cgit v1.2.3