From cf3371503b3592a2ec6a86d9dc12a39a2d3471a6 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 3 Nov 2016 14:18:53 +0100
Subject: [PATCH] Get rid of some CXX11 flags

---
 deps/glm/gtc/ulp.inl           | 16 ++++------------
 deps/glm/gtx/compatibility.inl |  4 +---
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/deps/glm/gtc/ulp.inl b/deps/glm/gtc/ulp.inl
index f1c29358c9..9b40140ce1 100644
--- a/deps/glm/gtc/ulp.inl
+++ b/deps/glm/gtc/ulp.inl
@@ -199,9 +199,7 @@ namespace glm
 	template <>
 	inline float next_float(float const & x)
 	{
-#		if((GLM_LANG & GLM_LANG_CXX11_FLAG))
-			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)))
+#		if((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
 			return detail::nextafterf(x, FLT_MAX);
 #		else
 			return nextafterf(x, FLT_MAX);
@@ -211,9 +209,7 @@ namespace glm
 	template <>
 	inline double next_float(double const & x)
 	{
-#		if((GLM_LANG & GLM_LANG_CXX11_FLAG))
-			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)))
+#		if((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
 			return detail::nextafter(x, std::numeric_limits<double>::max());
 #		else
 			return nextafter(x, DBL_MAX);
@@ -231,9 +227,7 @@ namespace glm
 
 	inline float prev_float(float const & x)
 	{
-#		if((GLM_LANG & GLM_LANG_CXX11_FLAG))
-			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)))
+#		if((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
 			return detail::nextafterf(x, FLT_MIN);
 #		else
 			return nextafterf(x, FLT_MIN);
@@ -242,9 +236,7 @@ namespace glm
 
 	inline double prev_float(double const & x)
 	{
-#		if((GLM_LANG & GLM_LANG_CXX11_FLAG))
-			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)))
+#		if((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
 			return _nextafter(x, DBL_MIN);
 #		else
 			return nextafter(x, DBL_MIN);
diff --git a/deps/glm/gtx/compatibility.inl b/deps/glm/gtx/compatibility.inl
index 962a3ae2cc..db6f980b42 100644
--- a/deps/glm/gtx/compatibility.inl
+++ b/deps/glm/gtx/compatibility.inl
@@ -14,9 +14,7 @@ namespace glm
 	inline bool isfinite(
 		genType const & x)
 	{
-#		if(GLM_LANG & GLM_LANG_CXX11_FLAG)
-			return std::isfinite(x) != 0;
-#		elif(GLM_COMPILER & GLM_COMPILER_VC)
+#		if(GLM_COMPILER & GLM_COMPILER_VC)
 			return _finite(x);
 #		elif(GLM_COMPILER & GLM_COMPILER_GCC && GLM_PLATFORM & GLM_PLATFORM_ANDROID)
 			return _isfinite(x) != 0;