Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp

2 files changed, 6 insertions, 5 deletions

diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h
index c221753cfbf..4c3630b175d 100644
--- a/src/server/shared/Dynamic/LinkedReference/Reference.h
+++ b/src/server/shared/Dynamic/LinkedReference/Reference.h
@@ -20,7 +20,7 @@
 #define _REFERENCE_H
 
 #include "Dynamic/LinkedList.h"
-#include <assert.h>
+#include "Errors.h" // for ASSERT
 
 //=====================================================
 
@@ -45,7 +45,7 @@ template <class TO, class FROM> class Reference : public LinkedListElement
         // Create new link
         void link(TO* toObj, FROM* fromObj)
         {
-            assert(fromObj);                                // fromObj MUST not be NULL
+            ASSERT(fromObj);                                // fromObj MUST not be NULL
             if (isValid())
                 unlink();
             if (toObj != NULL)
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index 50fbaa799c6..0d9314c48a3 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -20,6 +20,7 @@
 #include "Common.h"
 #include "utf8.h"
 #include "SFMT.h"
+#include "Errors.h" // for ASSERT
 #include <ace/TSS_T.h>
 #include <ace/INET_Addr.h>
 
@@ -28,19 +29,19 @@ static SFMTRandTSS sfmtRand;
 
 int32 irand(int32 min, int32 max)
 {
-    assert(max >= min);
+    ASSERT(max >= min);
     return int32(sfmtRand->IRandom(min, max));
 }
 
 uint32 urand(uint32 min, uint32 max)
 {
-    assert(max >= min);
+    ASSERT(max >= min);
     return sfmtRand->URandom(min, max);
 }
 
 float frand(float min, float max)
 {
-    assert(max >= min);
+    ASSERT(max >= min);
     return float(sfmtRand->Random() * (max - min) + min);
 }