diff options
8 files changed, 12 insertions, 11 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index fe6d7f85076..961472c60ec 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -8750,7 +8750,7 @@ void ObjectMgr::CheckScripts(ScriptsType type, std::set<int32>& ids) void ObjectMgr::LoadDbScriptStrings() { - LoadTrinityStrings("db_script_string",MIN_DB_SCRIPT_STRING_ID,MAX_DB_SCRIPT_STRING_ID); + LoadTrinityStrings("db_script_string", MIN_DB_SCRIPT_STRING_ID, MAX_DB_SCRIPT_STRING_ID); std::set<int32> ids; diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index c4875ce4a9e..641344c1f7b 100644 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -112,17 +112,18 @@ class DatabaseWorkerPool T* conn = new T(); conn->Open(m_infoString); + // no idea why it doesn't accept sLog here { ACE_Guard<ACE_Thread_Mutex> guard(m_connectionMap_mtx); ConnectionMap::const_iterator itr = m_sync_connections.find(ACE_Based::Thread::current()); #ifdef _DEBUG if (itr != m_sync_connections.end()) - sLog.outSQLDriver("Thread ["UI64FMTD"] already started a MySQL connection", (uint64)ACE_Based::Thread::currentId()); + ACE_Singleton<Log, ACE_Thread_Mutex>::instance()->outSQLDriver("Thread ["UI64FMTD"] already started a MySQL connection", (uint64)ACE_Based::Thread::currentId()); #endif m_sync_connections[ACE_Based::Thread::current()] = conn; } - sLog.outSQLDriver("Core thread with ID ["UI64FMTD"] initializing MySQL connection.", + ACE_Singleton<Log, ACE_Thread_Mutex>::instance()->outSQLDriver("Core thread with ID ["UI64FMTD"] initializing MySQL connection.", (uint64)ACE_Based::Thread::currentId()); ++m_connections; diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index 2d07b620c03..e84b7716522 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "LoginDatabase.h" +#include "CharacterDatabase.h" bool CharacterDatabaseConnection::Open(const std::string& infoString) { @@ -27,4 +27,4 @@ bool CharacterDatabaseConnection::Open(const std::string& infoString) */ return MySQLConnection::Open(infoString); -}
\ No newline at end of file +} diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h index acfe20228c6..7475b045740 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.h +++ b/src/server/shared/Database/Implementation/CharacterDatabase.h @@ -40,4 +40,4 @@ enum CharacterDatabaseStatements MAX_CHARACTERDATABASE_STATEMENTS, }; -#endif
\ No newline at end of file +#endif diff --git a/src/server/shared/Database/Implementation/LoginDatabase.cpp b/src/server/shared/Database/Implementation/LoginDatabase.cpp index 148a1b931aa..ccdffc2954d 100644 --- a/src/server/shared/Database/Implementation/LoginDatabase.cpp +++ b/src/server/shared/Database/Implementation/LoginDatabase.cpp @@ -27,4 +27,4 @@ bool LoginDatabaseConnection::Open(const std::string& infoString) */ return MySQLConnection::Open(infoString); -}
\ No newline at end of file +} diff --git a/src/server/shared/Database/Implementation/LoginDatabase.h b/src/server/shared/Database/Implementation/LoginDatabase.h index 520442d881b..6ad514774dd 100644 --- a/src/server/shared/Database/Implementation/LoginDatabase.h +++ b/src/server/shared/Database/Implementation/LoginDatabase.h @@ -40,4 +40,4 @@ enum LoginDatabaseStatements MAX_LOGINDATABASE_STATEMENTS, }; -#endif
\ No newline at end of file +#endif diff --git a/src/server/shared/Database/Implementation/WorldDatabase.cpp b/src/server/shared/Database/Implementation/WorldDatabase.cpp index d111e43a7c4..26a270f565a 100644 --- a/src/server/shared/Database/Implementation/WorldDatabase.cpp +++ b/src/server/shared/Database/Implementation/WorldDatabase.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "LoginDatabase.h" +#include "WorldDatabase.h" bool WorldDatabaseConnection::Open(const std::string& infoString) { @@ -27,4 +27,4 @@ bool WorldDatabaseConnection::Open(const std::string& infoString) */ return MySQLConnection::Open(infoString); -}
\ No newline at end of file +} diff --git a/src/server/shared/Database/Implementation/WorldDatabase.h b/src/server/shared/Database/Implementation/WorldDatabase.h index 162c3d8990e..eb76791faaa 100644 --- a/src/server/shared/Database/Implementation/WorldDatabase.h +++ b/src/server/shared/Database/Implementation/WorldDatabase.h @@ -40,4 +40,4 @@ enum WorldDatabaseStatements MAX_WORLDDATABASE_STATEMENTS, }; -#endif
\ No newline at end of file +#endif |