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/bnetserver | |
| 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/bnetserver')
| -rw-r--r-- | src/server/bnetserver/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/bnetserver/Main.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt index c92f67ac957..10b8e562143 100644 --- a/src/server/bnetserver/CMakeLists.txt +++ b/src/server/bnetserver/CMakeLists.txt @@ -63,6 +63,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/ipc ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Networking diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp index c367a1f7d40..310683dec37 100644 --- a/src/server/bnetserver/Main.cpp +++ b/src/server/bnetserver/Main.cpp @@ -81,7 +81,6 @@ static boost::asio::deadline_timer* _dbPingTimer; static uint32 _dbPingInterval; static boost::asio::deadline_timer* _banExpiryCheckTimer; static uint32 _banExpiryCheckInterval; -LoginDatabaseWorkerPool LoginDatabase; int main(int argc, char** argv) { |