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/database/Database/DatabaseEnv.h | 5 ++++- 1 file changed, 4 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 27b2bce744b..743341caf60 100644 --- a/src/server/database/Database/DatabaseEnv.h +++ b/src/server/database/Database/DatabaseEnv.h @@ -39,10 +39,13 @@ #include "Implementation/WorldDatabase.h" #include "Implementation/HotfixDatabase.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; +/// Accessor to the hotfix database extern HotfixDatabaseWorkerPool HotfixDatabase; #endif - -- cgit v1.2.3