Merge pull request #1318 from nlutsenko/patch-1

Remove Android-specific detection of GLM_HAS_CXX11_STL
g-truc · Dec 25, 2024 · 37112e4 · 37112e4
2 parents 33b4a62 + 4006273
commit 37112e4
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
@@ -148,10 +148,7 @@
 // http://gcc.gnu.org/projects/cxx0x.html
 // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
 
-// Android has multiple STLs but C++11 STL detection doesn't always work #284 #564
-#if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED)
-#	define GLM_HAS_CXX11_STL 0
-#elif (GLM_COMPILER & GLM_COMPILER_CUDA_RTC) == GLM_COMPILER_CUDA_RTC
+#if (GLM_COMPILER & GLM_COMPILER_CUDA_RTC) == GLM_COMPILER_CUDA_RTC
 #	define GLM_HAS_CXX11_STL 0
 #elif (GLM_COMPILER & GLM_COMPILER_HIP)
 #	define GLM_HAS_CXX11_STL 0