Skip to content

Commit 37112e4

Browse files
authored
Merge pull request #1318 from nlutsenko/patch-1
Remove Android-specific detection of GLM_HAS_CXX11_STL
2 parents 33b4a62 + 4006273 commit 37112e4

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

glm/detail/setup.hpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,7 @@
148148
// http://gcc.gnu.org/projects/cxx0x.html
149149
// http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
150150

151-
// Android has multiple STLs but C++11 STL detection doesn't always work #284 #564
152-
#if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED)
153-
# define GLM_HAS_CXX11_STL 0
154-
#elif (GLM_COMPILER & GLM_COMPILER_CUDA_RTC) == GLM_COMPILER_CUDA_RTC
151+
#if (GLM_COMPILER & GLM_COMPILER_CUDA_RTC) == GLM_COMPILER_CUDA_RTC
155152
# define GLM_HAS_CXX11_STL 0
156153
#elif (GLM_COMPILER & GLM_COMPILER_HIP)
157154
# define GLM_HAS_CXX11_STL 0

0 commit comments

Comments
 (0)