Removed preprocessor macros for VS08 compatibility

Changed some functions to C++11 variants rather than using #ifdefs to determine compiler

Author: sbx320

MTA10_Server/dbconmy/CDatabaseConnectionMySql.cpp

@@ -340,7 +340,7 @@ bool CDatabaseConnectionMySql::QueryInternal ( const SString& strQuery, CRegistr
                     case SQLITE_NULL:
                         break;
                     case SQLITE_INTEGER:
-                        cell.nVal = atoi64 ( inData );
+                        cell.nVal = std::atoll ( inData );
                         break;
                     case SQLITE_FLOAT:
                         cell.fVal = (float)atof ( inData );

Shared/sdk/CMatrix_Pad.h

@@ -16,7 +16,7 @@
 #include "CMatrix.h"
 
 /**
- * CVector Structure used internally by GTA.
+ * CMatrix Structure used internally by GTA.
  */
 class CMatrix_Padded
 {

Shared/sdk/Common.h

@@ -30,9 +30,9 @@
 #define MAX_SERVER_ELEMENTS 131072
 #define MAX_CLIENT_ELEMENTS 131072
 
-#if (MAX_SERVER_ELEMENTS&(MAX_SERVER_ELEMENTS-1)) != 0
-    #error MAX_SERVER_ELEMENTS "Macro must be power of 2"
-#endif
+// Make sure MAX_SERVER_ELEMENTS are a power of two
+static_assert( ( MAX_SERVER_ELEMENTS&( MAX_SERVER_ELEMENTS - 1 ) ) == 0, "MAX_SERVER_ELEMENTS must be a power of 2" );
+
 
 // ElementID structure
 struct ElementID

Shared/sdk/SharedUtil.Defines.h

@@ -98,23 +98,13 @@
 #endif
 
 #ifdef _MSC_VER
-    #define atoi64 _atoi64
     #define PRId64  "I64d"
     #define PRIx64  "I64x"
 #else
-    #define atoi64 std::atoll
     #define PRId64  "lld"
     #define PRIx64  "llx"
 #endif
 
-#if defined(WIN32)
-    #if _MSC_VER <= 1500
-        // VS08 does not have isnan, but _isnan
-        #include <float.h>
-        #define isnan _isnan
-    #endif
-#endif
-
 //
 // Macro for counting the number of elements in a static array
 //

Shared/sdk/SharedUtil.HashMap.h

@@ -22,6 +22,7 @@
     #define HASH_MAP_TYPE __gnu_cxx::hash_map
 #endif
 
+#include <functional>
 
 namespace SharedUtil
 {
@@ -109,36 +110,9 @@ namespace SharedUtil
 
 
 // Calculate a hash value for SString
-#if defined(WIN32)
-    #if _MSC_VER <= 1500
-        inline size_t hash_value ( const SString& strString )
-        {
-            const char *_Ptr = strString.c_str ();
-            return ( stdext::_Hash_value ( _Ptr, _Ptr + strString.size () ) );
-        }
-
-    #else
-        #include <functional>
-        inline size_t hash_value(const SString& strString)
-        {
-            std::hash<std::string> hashFunction;
-            return hashFunction( strString );
-        }    
-    #endif
-#elif defined(__GNUC__) && (__GNUC__ >= 3)
-
-    namespace __gnu_cxx
-    {
-        template<>
-        struct hash < SString >
-        {
-            size_t operator () ( const SString& strString ) const
-            {
-                return __stl_hash_string ( strString );
-            }
-        };
-    }
-
-#endif
-
+inline size_t hash_value ( const SString& strString )
+{
+    std::hash<std::string> hashFunction;
+    return hashFunction ( strString );
+}
 #endif  // WITH_ALLOC_TRACKING

Shared/sdk/SharedUtil.Misc.hpp

@@ -345,7 +345,7 @@ SString SharedUtil::GetPostUpdateConnect( void )
     CArgMap argMap;
     argMap.SetFromString( strPostUpdateConnect );
     SString strHost = argMap.Get( "host" );
-    time_t timeThen = (time_t)atoi64( argMap.Get( "time" ) );
+    time_t timeThen = (time_t)std::atoll( argMap.Get( "time" ) );
 
     // Expire after 5 mins
     double seconds = difftime( time( NULL ), timeThen );