diff options
| author | Ferenc Arn <tagcup@yahoo.com> | 2017-06-14 10:11:53 -0500 |
|---|---|---|
| committer | Ferenc Arn <tagcup@yahoo.com> | 2017-06-14 18:30:22 -0500 |
| commit | cd1e14b1da0578aef1566e48b092a84b846372a6 (patch) | |
| tree | d810dc324c9894251d7348f0e798356ece8c9c52 | |
| parent | b21a1232baf9db42cc57e32ecaf5abc0d0b05c86 (diff) | |
Use inline code for isinf as a workaround for libstdc++ versions from gcc 5.x era.
Fixes #9166.
| -rw-r--r-- | core/math/math_funcs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index dd64b10f88..45509a0808 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -110,8 +110,8 @@ public: static _ALWAYS_INLINE_ bool is_inf(double p_val) { #ifdef _MSC_VER return !_finite(p_val); -// workaround for mingw builds on travis -#elif defined(__MINGW32__) || defined(__MINGW64__) +// use an inline implementation of isinf as a workaround for problematic libstdc++ versions from gcc 5.x era +#elif defined(__GNUC__) && __GNUC__ < 6 union { uint64_t u; double f; @@ -127,8 +127,8 @@ public: static _ALWAYS_INLINE_ bool is_inf(float p_val) { #ifdef _MSC_VER return !_finite(p_val); -// workaround for mingw builds on travis -#elif defined(__MINGW32__) || defined(__MINGW64__) +// use an inline implementation of isinf as a workaround for problematic libstdc++ versions from gcc 5.x era +#elif defined(__GNUC__) && __GNUC__ < 6 union { uint32_t u; float f; |