From 9ab74b39109bb611c0deb5228640b92f22c83089 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 6 Sep 2014 22:58:29 +0200
Subject: Core/DBLayer: Fixed GetUInt32,GetInt64 and GetUInt64 on windows when
 value stored in db was greater than 2147483647

---
 src/server/shared/Database/Field.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/server/shared/Database/Field.h')

diff --git a/src/server/shared/Database/Field.h b/src/server/shared/Database/Field.h
index 5f427a5871b..2e888be5ed3 100644
--- a/src/server/shared/Database/Field.h
+++ b/src/server/shared/Database/Field.h
@@ -50,7 +50,7 @@ class Field
 
             if (data.raw)
                 return *reinterpret_cast<uint8*>(data.value);
-            return static_cast<uint8>(atol((char*)data.value));
+            return static_cast<uint8>(strtoul((char*)data.value, nullptr, 10));
         }
 
         int8 GetInt8() const
@@ -68,7 +68,7 @@ class Field
 
             if (data.raw)
                 return *reinterpret_cast<int8*>(data.value);
-            return static_cast<int8>(atol((char*)data.value));
+            return static_cast<int8>(strtol((char*)data.value, NULL, 10));
         }
 
         uint16 GetUInt16() const
@@ -86,7 +86,7 @@ class Field
 
             if (data.raw)
                 return *reinterpret_cast<uint16*>(data.value);
-            return static_cast<uint16>(atol((char*)data.value));
+            return static_cast<uint16>(strtoul((char*)data.value, nullptr, 10));
         }
 
         int16 GetInt16() const
@@ -104,7 +104,7 @@ class Field
 
             if (data.raw)
                 return *reinterpret_cast<int16*>(data.value);
-            return static_cast<int16>(atol((char*)data.value));
+            return static_cast<int16>(strtol((char*)data.value, NULL, 10));
         }
 
         uint32 GetUInt32() const
@@ -122,7 +122,7 @@ class Field
 
             if (data.raw)
                 return *reinterpret_cast<uint32*>(data.value);
-            return static_cast<uint32>(atol((char*)data.value));
+            return static_cast<uint32>(strtoul((char*)data.value, nullptr, 10));
         }
 
         int32 GetInt32() const
@@ -140,7 +140,7 @@ class Field
 
             if (data.raw)
                 return *reinterpret_cast<int32*>(data.value);
-            return static_cast<int32>(atol((char*)data.value));
+            return static_cast<int32>(strtol((char*)data.value, NULL, 10));
         }
 
         uint64 GetUInt64() const
@@ -158,7 +158,7 @@ class Field
 
             if (data.raw)
                 return *reinterpret_cast<uint64*>(data.value);
-            return static_cast<uint64>(atol((char*)data.value));
+            return static_cast<uint64>(strtoull((char*)data.value, nullptr, 10));
         }
 
         int64 GetInt64() const
@@ -176,7 +176,7 @@ class Field
 
             if (data.raw)
                 return *reinterpret_cast<int64*>(data.value);
-            return static_cast<int64>(strtol((char*)data.value, NULL, 10));
+            return static_cast<int64>(strtoll((char*)data.value, NULL, 10));
         }
 
         float GetFloat() const
-- 
cgit v1.2.3