aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <runningnak3d@gmail.com>2010-06-07 07:58:31 -0600
committerBrian <runningnak3d@gmail.com>2010-06-07 07:58:31 -0600
commit12dc250bf06d2eccc0678a5eb2f5a881fec08744 (patch)
treef17a14a3f6dda97cdb18beb27f7b2f0854d8916c
parent36584926e6684c0df19562e3a438f45ff38dee10 (diff)
* Lib trinitydatabase builds again
--HG-- branch : trunk
-rw-r--r--src/server/shared/DataStores/DBCFileLoader.h2
-rw-r--r--src/server/shared/Database/Database.cpp12
-rw-r--r--src/server/shared/Database/SQLStorageImpl.h6
-rw-r--r--src/server/shared/Database/SqlOperations.h4
-rw-r--r--src/server/shared/Utilities/ByteConverter.h2
-rw-r--r--src/server/shared/Utilities/Timer.h2
6 files changed, 14 insertions, 14 deletions
diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h
index a97ab4d60fa..f59ad038ce0 100644
--- a/src/server/shared/DataStores/DBCFileLoader.h
+++ b/src/server/shared/DataStores/DBCFileLoader.h
@@ -18,7 +18,7 @@
#ifndef DBC_FILE_LOADER_H
#define DBC_FILE_LOADER_H
-#include "Platform/Define.h"
+#include "Define.h"
#include "Utilities/ByteConverter.h"
#include <cassert>
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
index 7646a451eb4..91275716bf8 100644
--- a/src/server/shared/Database/Database.cpp
+++ b/src/server/shared/Database/Database.cpp
@@ -19,18 +19,18 @@
*/
#include "DatabaseEnv.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
#include "Common.h"
-#include "UpdateFields.h"
+#include "Updates/UpdateFields.h"
-#include "Util.h"
+#include "Utilities/Util.h"
#include "Policies/SingletonImp.h"
-#include "Platform/Define.h"
-#include "Threading.h"
+#include "Define.h"
+#include "Threading/Threading.h"
#include "Database/SqlDelayThread.h"
#include "Database/SqlOperations.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
#include <ctime>
diff --git a/src/server/shared/Database/SQLStorageImpl.h b/src/server/shared/Database/SQLStorageImpl.h
index c74be48c34c..b3d06484e2e 100644
--- a/src/server/shared/Database/SQLStorageImpl.h
+++ b/src/server/shared/Database/SQLStorageImpl.h
@@ -16,9 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "ProgressBar.h"
-#include "Log.h"
-#include "DBCFileLoader.h"
+#include "Utilities/ProgressBar.h"
+#include "Logging/Log.h"
+#include "DataStores/DBCFileLoader.h"
template<class T>
template<class S, class D>
diff --git a/src/server/shared/Database/SqlOperations.h b/src/server/shared/Database/SqlOperations.h
index f2e09c0c921..eb28a2c0790 100644
--- a/src/server/shared/Database/SqlOperations.h
+++ b/src/server/shared/Database/SqlOperations.h
@@ -25,9 +25,9 @@
#include "ace/Thread_Mutex.h"
#include "ace/Method_Request.h"
-#include "LockedQueue.h"
+#include "Threading/LockedQueue.h"
#include <queue>
-#include "Utilities/Callback.h"
+#include "Threading/Callback.h"
#include "QueryResult.h"
/// ---- BASE ---
diff --git a/src/server/shared/Utilities/ByteConverter.h b/src/server/shared/Utilities/ByteConverter.h
index f8b6bd72498..24a89f464b8 100644
--- a/src/server/shared/Utilities/ByteConverter.h
+++ b/src/server/shared/Utilities/ByteConverter.h
@@ -25,7 +25,7 @@
for cross platform where they have different endians.
*/
-#include<Platform/Define.h>
+#include "Define.h"
#include<algorithm>
namespace ByteConverter
diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h
index ed78c1d42e7..326df71bf50 100644
--- a/src/server/shared/Utilities/Timer.h
+++ b/src/server/shared/Utilities/Timer.h
@@ -21,7 +21,7 @@
#ifndef TRINITY_TIMER_H
#define TRINITY_TIMER_H
-#include "shared/CompilerDefs.h"
+#include "CompilerDefs.h"
#if PLATFORM == PLATFORM_WINDOWS
# include <ace/config-all.h>