diff options
| author | ShinDarth <borzifrancesco@gmail.com> | 2016-08-16 23:45:53 +0200 |
|---|---|---|
| committer | ShinDarth <borzifrancesco@gmail.com> | 2016-08-16 23:45:53 +0200 |
| commit | 24ae2150aa36207d0dc3feecf32006e3a8f9eed8 (patch) | |
| tree | b5d12527ee3decba52c880c9f98bb7dfa8c5f22c /modules | |
| parent | a4589f71d5906281581303b4d9430ea65f79c31a (diff) | |
Build/Clang: removed deprecated finite() fixing 59 warnings
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/acore/deps/mysqllite/include/my_global.h | 6 | ||||
| -rw-r--r-- | modules/acore/framework/Common.h | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/modules/acore/deps/mysqllite/include/my_global.h b/modules/acore/deps/mysqllite/include/my_global.h index c1ae8a6d6b..3bd3f219c4 100644 --- a/modules/acore/deps/mysqllite/include/my_global.h +++ b/modules/acore/deps/mysqllite/include/my_global.h @@ -787,11 +787,7 @@ inline unsigned long long my_double2ulonglong(double d) #endif #ifndef isfinite -#ifdef HAVE_FINITE -#define isfinite(x) finite(x) -#else -#define finite(x) (1.0 / fabs(x) > 0.0) -#endif /* HAVE_FINITE */ +#define isfinite(x) (1.0 / fabs(x) > 0.0) #endif /* isfinite */ #ifndef HAVE_ISNAN diff --git a/modules/acore/framework/Common.h b/modules/acore/framework/Common.h index 3415a0336c..41cb831ebe 100644 --- a/modules/acore/framework/Common.h +++ b/modules/acore/framework/Common.h @@ -122,7 +122,9 @@ #define snprintf _snprintf #define atoll _atoi64 #define vsnprintf _vsnprintf -#define finite(X) _finite(X) +#ifndef isfinite +#define isfinite(X) _finite(X) +#endif #define llabs _abs64 #else @@ -134,12 +136,12 @@ #endif -inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; } +inline float finiteAlways(float f) { return isfinite(f) ? f : 0.0f; } #if COMPILER == COMPILER_MICROSOFT inline bool myisfinite(float f) { return _finite(f) && !_isnan(f); } #else -inline bool myisfinite(float f) { return finite(f) && !std::isnan(f); } +inline bool myisfinite(float f) { return isfinite(f) && !std::isnan(f); } #endif #define atol(a) strtoul( a, NULL, 10) |