gnu

g-truc · Dec 19, 2023 · 769a300 · 769a300
1 parent 467e84a
commit 769a300
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp
@@ -20,8 +20,6 @@
 #	endif
 #endif
 
-#include <functional>
-
 #include "../vec2.hpp"
 #include "../vec3.hpp"
 #include "../vec4.hpp"
@@ -46,6 +44,9 @@
 #	error "GLM_GTX_hash requires C++11 standard library support"
 #endif
 
+#if GLM_LANG & GLM_LANG_CXX11
+#include <functional>
+
 namespace std
 {
 	template<typename T, glm::qualifier Q>
@@ -140,3 +141,5 @@ namespace std
 } // namespace std
 
 #include "hash.inl"
+
+#endif //GLM_LANG & GLM_LANG_CXX11
diff --git a/test/gtx/gtx_hash.cpp b/test/gtx/gtx_hash.cpp
@@ -2,6 +2,7 @@
 #include <glm/gtx/hash.hpp>
 #include <map>
 
+#if GLM_LANG& GLM_LANG_CXX11
 int test_compile()
 {
 	int Error = 0;
@@ -47,10 +48,10 @@ int test_compile()
 
 int main()
 {
-	int Error = 0;
+    int Error = 0;
 
-	Error += test_compile();
+    Error += test_compile();
 
-	return Error;
+    return Error;
 }
-
+#endif//GLM_LANG& GLM_LANG_CXX11