From f7ad5b26243c44b37c496021b75d98bc72fcdf4a Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Sat, 21 Aug 2010 09:53:04 +0200
Subject: Core/Build: Clean up more nonPCH-issues + fix a warning in Timer.h
 (unsigned/signed cast)

--HG--
branch : trunk
---
 src/server/game/Mails/Mail.cpp                        | 1 +
 src/server/game/Reputation/ReputationMgr.cpp          | 1 +
 src/server/shared/CompilerDefs.h                      | 1 -
 src/server/shared/Database/MySQLConnection.cpp        | 5 +++++
 src/server/shared/Debugging/WheatyExceptionReport.cpp | 4 ++++
 src/server/shared/Utilities/Timer.h                   | 2 +-
 6 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp
index 8e43ed7756e..0123f4ca5ba 100644
--- a/src/server/game/Mails/Mail.cpp
+++ b/src/server/game/Mails/Mail.cpp
@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "DatabaseEnv.h"
 #include "Mail.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp
index adf6c9a7433..7162deb4b03 100644
--- a/src/server/game/Reputation/ReputationMgr.cpp
+++ b/src/server/game/Reputation/ReputationMgr.cpp
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "DatabaseEnv.h"
 #include "ReputationMgr.h"
 #include "DBCStores.h"
 #include "Player.h"
diff --git a/src/server/shared/CompilerDefs.h b/src/server/shared/CompilerDefs.h
index d2d470e2097..e3992d8462a 100644
--- a/src/server/shared/CompilerDefs.h
+++ b/src/server/shared/CompilerDefs.h
@@ -61,4 +61,3 @@
 #  pragma warning( disable : 4786 )                         // identifier was truncated to '255' characters in the debug information
 #endif
 #endif
-
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index 9f16cbdf414..6da629b395e 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -15,7 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+
+#include "Common.h"
+
 #include <mysql.h>
+
 #include "DatabaseEnv.h"
 #include "QueryResult.h"
 #include "SQLOperation.h"
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp
index bc21b9e45b6..b5171fa5f89 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.cpp
+++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp
@@ -14,9 +14,13 @@
 #include <tchar.h>
 #define _NO_CVCONST_H
 #include <dbghelp.h>
+
 #include "WheatyExceptionReport.h"
+
+#include "Common.h"
 #include "SystemConfig.h"
 #include "revision.h"
+
 #define CrashFolder _T("Crashes")
 #pragma comment(linker, "/DEFAULTLIB:dbghelp.lib")
 
diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h
index 326df71bf50..49ddb46fefe 100644
--- a/src/server/shared/Utilities/Timer.h
+++ b/src/server/shared/Utilities/Timer.h
@@ -191,7 +191,7 @@ struct PeriodicTimer
             if ((i_expireTime -= diff) > 0)
                 return false;
 
-            i_expireTime += i_period > diff ? i_period : diff;
+            i_expireTime += i_period > int32(diff) ? i_period : diff;
             return true;
         }
 
-- 
cgit v1.2.3