Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk

This commit is contained in:
Yehonal
2016-08-17 10:15:37 +02:00
4 changed files with 10 additions and 7 deletions

View File

@@ -15,6 +15,6 @@ if(WITH_COREDEBUG)
endif()
# -Wno-narrowing needed to suppress a warning in g3d
# -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register")
# -Wno-deprecated-register -Wstring-plus-int -Wpointer-bool-conversion are needed to suppress gsoap warnings on Unix systems.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wpointer-bool-conversion -Wparentheses")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1")

View File

@@ -786,9 +786,12 @@ inline unsigned long long my_double2ulonglong(double d)
#define SIZE_T_MAX (~((size_t) 0))
#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
#define isnan(x) ((x) != (x))