[Build] Fix FTBFS with Ubuntu Xenial.Use -std=gnu++11 for gcc-5.

diff --git a/source/build-cmake/params/buildvars_linux_params_gcc.dat b/source/build-cmake/params/buildvars_linux_params_gcc.dat
index ec1d3f9..9523633 100644 (file)
--- a/source/build-cmake/params/buildvars_linux_params_gcc.dat
+++ b/source/build-cmake/params/buildvars_linux_params_gcc.dat
@@ -6,11 +6,12 @@
 CCMAKE_CC=gcc
 CCMAKE_CXX=g++
 
-#MAKEFLAGS_BASE="-std=gnu++11 ${MAKEFLAGS_BASE}"
-
 if [ -v CC_SUFFIX ] ; then
    CCMAKE_CC=${CCMAKE_CC}-${CC_SUFFIX}
    CCMAKE_CXX=${CCMAKE_CXX}-${CC_SUFFIX}
+   if [ ${CC_SUFFIX} -le 5 ] ; then
+      MAKEFLAGS_BASE="-std=gnu++11 ${MAKEFLAGS_BASE}"
+   fi
 fi
 if [ -v CC_PREFIX ] ; then
    CCMAKE_CC=${CC_PREFIX}-${CCMAKE_CC}

diff --git a/source/src/common.h b/source/src/common.h
index 73b1339..faa6dda 100644 (file)
--- a/source/src/common.h
+++ b/source/src/common.h
@@ -485,7 +485,8 @@ uint16_t DLL_PREFIX EndianToLittle_WORD(uint16_t x);
        #define my_isfinite _finite
        #define my_log2(v) (log((double)(v)) / log(2.0))
 #else
-       #define my_isfinite isfinite
+       #include <cmath>
+       #define my_isfinite std::isfinite
        #define my_log2 log2
 #endif