From f7418a4323aab76204495fd9fefee916f563cc03 Mon Sep 17 00:00:00 2001
From: Antz <antz@getmangos.eu>
Date: Wed, 12 Oct 2016 08:33:59 +0100
Subject: [PATCH] Fixed vs2012 build

---
 src/game/WorldHandlers/GridDefines.h | 34 ++++++++++++++--------------
 src/shared/Common/Common.h           |  4 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/game/WorldHandlers/GridDefines.h b/src/game/WorldHandlers/GridDefines.h
index 042e950e6..081488c8e 100644
--- a/src/game/WorldHandlers/GridDefines.h
+++ b/src/game/WorldHandlers/GridDefines.h
@@ -84,10 +84,10 @@ template<const unsigned int LIMIT>
 struct CoordPair
 {
     CoordPair(uint32 x = 0, uint32 y = 0) : x_coord(x), y_coord(y) {}
-    CoordPair(const CoordPair<LIMIT> &obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) {}
-    bool operator==(const CoordPair<LIMIT> &obj) const { return (obj.x_coord == x_coord && obj.y_coord == y_coord); }
-    bool operator!=(const CoordPair<LIMIT> &obj) const { return !operator==(obj); }
-    CoordPair<LIMIT>& operator=(const CoordPair<LIMIT> &obj)
+    CoordPair(const CoordPair<LIMIT>& obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) {}
+    bool operator==(const CoordPair<LIMIT>& obj) const { return (obj.x_coord == x_coord && obj.y_coord == y_coord); }
+    bool operator!=(const CoordPair<LIMIT>& obj) const { return !operator==(obj); }
+    CoordPair<LIMIT>& operator=(const CoordPair<LIMIT>& obj)
     {
         x_coord = obj.x_coord;
         y_coord = obj.y_coord;
@@ -97,33 +97,33 @@ struct CoordPair
     void operator<<(const uint32 val)
     {
         if (x_coord > val)
-            x_coord -= val;
+            { x_coord -= val; }
         else
-            x_coord = 0;
+            { x_coord = 0; }
     }
 
     void operator>>(const uint32 val)
     {
         if (x_coord + val < LIMIT)
-            x_coord += val;
+            { x_coord += val; }
         else
-            x_coord = LIMIT - 1;
+            { x_coord = LIMIT - 1; }
     }
 
     void operator-=(const uint32 val)
     {
         if (y_coord > val)
-            y_coord -= val;
+            { y_coord -= val; }
         else
-            y_coord = 0;
+            { y_coord = 0; }
     }
 
     void operator+=(const uint32 val)
     {
         if (y_coord + val < LIMIT)
-            y_coord += val;
+            { y_coord += val; }
         else
-            y_coord = LIMIT - 1;
+            { y_coord = LIMIT - 1; }
     }
 
     CoordPair& normalize()
@@ -167,14 +167,14 @@ namespace MaNGOS
     inline void NormalizeMapCoord(float& c)
     {
         if (c > MAP_HALFSIZE - 0.5)
-            c = MAP_HALFSIZE - 0.5;
+            { c = MAP_HALFSIZE - 0.5; }
         else if (c < -(MAP_HALFSIZE - 0.5))
-            c = -(MAP_HALFSIZE - 0.5);
+            { c = -(MAP_HALFSIZE - 0.5); }
     }
 
     inline bool IsValidMapCoord(float c)
     {
-        return std::isfinite(c) && (std::fabs(c) <= MAP_HALFSIZE - 0.5);
+        return finite(c) && (std::fabs(c) <= MAP_HALFSIZE - 0.5);
     }
 
     inline bool IsValidMapCoord(float x, float y)
@@ -184,12 +184,12 @@ namespace MaNGOS
 
     inline bool IsValidMapCoord(float x, float y, float z)
     {
-        return IsValidMapCoord(x, y) && std::isfinite(z);
+        return IsValidMapCoord(x, y) && finite(z);
     }
 
     inline bool IsValidMapCoord(float x, float y, float z, float o)
     {
-        return IsValidMapCoord(x, y, z) && std::isfinite(o);
+        return IsValidMapCoord(x, y, z) && finite(o);
     }
 }
 #endif
diff --git a/src/shared/Common/Common.h b/src/shared/Common/Common.h
index 13a39c5b5..a8d771a74 100644
--- a/src/shared/Common/Common.h
+++ b/src/shared/Common/Common.h
@@ -72,7 +72,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <cmath>
+#include <math.h>
 #include <errno.h>
 #include <signal.h>
 #include <assert.h>
@@ -173,7 +173,7 @@ typedef off_t ACE_OFF_T;
  * @param f
  * @return float
  */
-inline float finiteAlways(float f) { return std::isfinite(f) ? f : 0.0f; }
+inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; }
 
 #define atol(a) strtoul( a, NULL, 10)