diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-07-24 03:35:19 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-24 03:35:19 +0100 |
| commit | 5193eaac872d4bfa1fe511c15ea4e062824d19f2 (patch) | |
| tree | b11750c08d750ee3c99736a59944060e584413fc /src/server/shared | |
| parent | 8bc519a308ab78b1d6b243f49b332ddd9dd4ae17 (diff) | |
| parent | 7524e2dfda499177ffe633bd8284aad2cf1f547f (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/Common.h | 3 | ||||
| -rw-r--r-- | src/server/shared/Threading/ProcessPriority.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index 1e3b0e46221..e74e707a942 100644 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -101,7 +101,6 @@ #define snprintf _snprintf #define atoll _atoi64 #define vsnprintf _vsnprintf -#define finite(X) _finite(X) #define llabs _abs64 #else @@ -111,7 +110,7 @@ #endif -inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; } +inline float finiteAlways(float f) { return std::isfinite(f) ? f : 0.0f; } #define STRINGIZE(a) #a diff --git a/src/server/shared/Threading/ProcessPriority.h b/src/server/shared/Threading/ProcessPriority.h index cd116ccbbc8..06a5622fb9d 100644 --- a/src/server/shared/Threading/ProcessPriority.h +++ b/src/server/shared/Threading/ProcessPriority.h @@ -28,6 +28,11 @@ void SetProcessPriority(const std::string logChannel) { +// Suppresses Mac OS X Warning since logChannel isn't used. +#if PLATFORM_APPLE + (void)logChannel; +#endif + #if defined(_WIN32) || defined(__linux__) ///- Handle affinity for multiple processors and process priority |