From a5d1bc77abc275402240bec1380fa87f04461ba8 Mon Sep 17 00:00:00 2001
From: Xanadu <none@none>
Date: Fri, 5 Feb 2010 00:31:28 +0100
Subject: A great purge of obsolete macros.

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

(limited to 'src/shared/Database')

diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index e1b44c99057..577a6ad25dd 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -34,7 +34,7 @@ typedef UNORDERED_MAP<ACE_Based::Thread* , SqlResultQueue*> QueryQueues;
 
 #define MAX_QUERY_LEN   32*1024
 
-class TRINITY_DLL_SPEC Database
+class Database
 {
     protected:
         Database() : m_threadBody(NULL), m_delayThread(NULL) {};
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index cc94ca3540d..b01e375ca91 100644
--- a/src/shared/Database/DatabaseMysql.cpp
+++ b/src/shared/Database/DatabaseMysql.cpp
@@ -200,7 +200,7 @@ bool DatabaseMysql::_Query(const char *sql, MYSQL_RES **pResult, MYSQL_FIELD **p
     {
         // guarded block for thread-safe mySQL request
         ACE_Guard<ACE_Thread_Mutex> query_connection_guard(mMutex);
-        #ifdef MANGOS_DEBUG
+        #ifdef TRINITY_DEBUG
         uint32 _s = getMSTime();
         #endif
         if(mysql_query(mMysql, sql))
@@ -305,7 +305,7 @@ bool DatabaseMysql::DirectExecute(const char* sql)
         // guarded block for thread-safe mySQL request
         ACE_Guard<ACE_Thread_Mutex> query_connection_guard(mMutex);
 
-        #ifdef MANGOS_DEBUG
+        #ifdef TRINITY_DEBUG
         uint32 _s = getMSTime();
         #endif
         if(mysql_query(mMysql, sql))
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index 4f7ab2b88b7..43462558498 100644
--- a/src/shared/Database/DatabaseMysql.h
+++ b/src/shared/Database/DatabaseMysql.h
@@ -36,7 +36,7 @@
 #include <mysql.h>
 #endif
 
-class TRINITY_DLL_SPEC DatabaseMysql : public Database
+class DatabaseMysql : public Database
 {
     friend class Trinity::OperatorNew<DatabaseMysql>;
 
diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h
index f9488f5a030..5c380c0d5d1 100644
--- a/src/shared/Database/QueryResult.h
+++ b/src/shared/Database/QueryResult.h
@@ -26,7 +26,7 @@
 
 #include "Field.h"
 
-class TRINITY_DLL_SPEC QueryResult
+class QueryResult
 {
     public:
         QueryResult(uint64 rowCount, uint32 fieldCount)
@@ -53,7 +53,7 @@ typedef ACE_Refcounted_Auto_Ptr<QueryResult, ACE_Null_Mutex> QueryResult_AutoPtr
 
 typedef std::vector<std::string> QueryFieldNames;
 
-class TRINITY_DLL_SPEC QueryNamedResult
+class QueryNamedResult
 {
     public:
         explicit QueryNamedResult(QueryResult* query, QueryFieldNames const& names) : mQuery(query), mFieldNames(names) {}
-- 
cgit v1.2.3