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/database/Database/DatabaseEnv.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server/database/Database/DatabaseEnv.h') diff --git a/src/server/database/Database/DatabaseEnv.h b/src/server/database/Database/DatabaseEnv.h index cc8355a1302..c9a7672ac57 100644 --- a/src/server/database/Database/DatabaseEnv.h +++ b/src/server/database/Database/DatabaseEnv.h @@ -38,9 +38,11 @@ #include "Implementation/CharacterDatabase.h" #include "Implementation/WorldDatabase.h" +/// Accessor to the world database extern WorldDatabaseWorkerPool WorldDatabase; +/// Accessor to the character database extern CharacterDatabaseWorkerPool CharacterDatabase; +/// Accessor to the realm/login database extern LoginDatabaseWorkerPool LoginDatabase; #endif - -- cgit v1.2.3