From 25e5c99dec793dfcc45a41873af1760392ee8844 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 13 May 2009 18:22:21 -0500
Subject:     [7810] Moved ZThread related code on ACE framework. Author: Ambal

    Remove ZThread source code from mangos.

--HG--
branch : trunk
---
 src/shared/Database/Database.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/shared/Database/Database.cpp')

diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 07ece3b0cd9..783b520ded3 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -110,7 +110,8 @@ bool Database::PExecuteLog(const char * format,...)
 
 void Database::SetResultQueue(SqlResultQueue * queue)
 {
-    m_queryQueues[ZThread::ThreadImpl::current()] = queue;
+	m_queryQueues[ACE_Based::Thread::current()] = queue;
+
 }
 
 QueryResult* Database::PQuery(const char *format,...)
-- 
cgit v1.2.3


From 54572864167640fa7ccadb53f6cc607e42f29561 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 13 May 2009 18:28:21 -0500
Subject: [7815] Apply mangos code style: Replace tabs by spaces in recent
 added code. Author: VladimirMangos

--HG--
branch : trunk
---
 src/game/World.h                      | 4 ++--
 src/shared/Database/Database.cpp      | 2 +-
 src/shared/Database/DatabaseMysql.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/shared/Database/Database.cpp')

diff --git a/src/game/World.h b/src/game/World.h
index 80d5717f981..11a83678d35 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -626,7 +626,7 @@ class World
         static float m_VisibleObjectGreyDistance;
 
         // CLI command holder to be thread safe
-		ACE_Based::LockedQueue<CliCommandHolder*,ACE_Thread_Mutex> cliCmdQueue;
+        ACE_Based::LockedQueue<CliCommandHolder*,ACE_Thread_Mutex> cliCmdQueue;
         SqlResultQueue *m_resultQueue;
 
         // next daily quests reset time
@@ -637,7 +637,7 @@ class World
 
         //sessions that are added async
         void AddSession_(WorldSession* s);
-		ACE_Based::LockedQueue<WorldSession*, ACE_Thread_Mutex> addSessQueue;
+        ACE_Based::LockedQueue<WorldSession*, ACE_Thread_Mutex> addSessQueue;
 
         //used versions
         std::string m_DBVersion;
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 783b520ded3..d5ccc581232 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -110,7 +110,7 @@ bool Database::PExecuteLog(const char * format,...)
 
 void Database::SetResultQueue(SqlResultQueue * queue)
 {
-	m_queryQueues[ACE_Based::Thread::current()] = queue;
+    m_queryQueues[ACE_Based::Thread::current()] = queue;
 
 }
 
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index 92b303a167d..9574d3dc2ac 100644
--- a/src/shared/Database/DatabaseMysql.cpp
+++ b/src/shared/Database/DatabaseMysql.cpp
@@ -351,7 +351,7 @@ bool DatabaseMysql::CommitTransaction()
     // don't use queued execution if it has not been initialized
     if (!m_threadBody)
     {
-		if (tranThread != ACE_Based::Thread::current())
+        if (tranThread != ACE_Based::Thread::current())
             return false;
         bool _res = _TransactionCmd("COMMIT");
         tranThread = NULL;
-- 
cgit v1.2.3