diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-15 20:46:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 20:46:10 +0200 |
| commit | 4f8d9f0915ccf6e337313e7b47adc7487d76e313 (patch) | |
| tree | 9e51ba524cee48535221dc3123f86db25d369c12 /core | |
| parent | 7b1f1dbf37a06b4dd5922f843101fce8b980481c (diff) | |
| parent | cd1e14b1da0578aef1566e48b092a84b846372a6 (diff) | |
Merge pull request #9177 from tagcup/gcc5_isinf
Use inline code for isinf with gcc versions <6.
Diffstat (limited to 'core')
| -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; |