mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of some CXX11 flags

Browse Source
This commit is contained in:
twinaphex 2016-11-03 14:18:53 +01:00
parent 5fa42a77af
commit cf3371503b
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
deps/glm/gtc/ulp.inl vendored
View File

@ -199,9 +199,7 @@ namespace glm
template <> template <>
inline float next_float(float const & x) inline float next_float(float const & x)
{ {
# if((GLM_LANG & GLM_LANG_CXX11_FLAG)) # if((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return std::nextafter(x, std::numeric_limits<float>::max());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return detail::nextafterf(x, FLT_MAX); return detail::nextafterf(x, FLT_MAX);
# else # else
return nextafterf(x, FLT_MAX); return nextafterf(x, FLT_MAX);
@ -211,9 +209,7 @@ namespace glm
template <> template <>
inline double next_float(double const & x) inline double next_float(double const & x)
{ {
# if((GLM_LANG & GLM_LANG_CXX11_FLAG)) # if((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return std::nextafter(x, std::numeric_limits<double>::max());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return detail::nextafter(x, std::numeric_limits<double>::max()); return detail::nextafter(x, std::numeric_limits<double>::max());
# else # else
return nextafter(x, DBL_MAX); return nextafter(x, DBL_MAX);
@ -231,9 +227,7 @@ namespace glm
inline float prev_float(float const & x) inline float prev_float(float const & x)
{ {
# if((GLM_LANG & GLM_LANG_CXX11_FLAG)) # if((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return std::nextafter(x, std::numeric_limits<float>::min());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return detail::nextafterf(x, FLT_MIN); return detail::nextafterf(x, FLT_MIN);
# else # else
return nextafterf(x, FLT_MIN); return nextafterf(x, FLT_MIN);
@ -242,9 +236,7 @@ namespace glm
inline double prev_float(double const & x) inline double prev_float(double const & x)
{ {
# if((GLM_LANG & GLM_LANG_CXX11_FLAG)) # if((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return std::nextafter(x, std::numeric_limits<double>::min());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return _nextafter(x, DBL_MIN); return _nextafter(x, DBL_MIN);
# else # else
return nextafter(x, DBL_MIN); return nextafter(x, DBL_MIN);

4
deps/glm/gtx/compatibility.inl vendored
View File

@ -14,9 +14,7 @@ namespace glm
inline bool isfinite( inline bool isfinite(
genType const & x) genType const & x)
{ {
# if(GLM_LANG & GLM_LANG_CXX11_FLAG) # if(GLM_COMPILER & GLM_COMPILER_VC)
return std::isfinite(x) != 0;
# elif(GLM_COMPILER & GLM_COMPILER_VC)
return _finite(x); return _finite(x);
# elif(GLM_COMPILER & GLM_COMPILER_GCC && GLM_PLATFORM & GLM_PLATFORM_ANDROID) # elif(GLM_COMPILER & GLM_COMPILER_GCC && GLM_PLATFORM & GLM_PLATFORM_ANDROID)
return _isfinite(x) != 0; return _isfinite(x) != 0;