Merge branch 'patch-1' of github.com:abrady/glm into fix-hash

g-truc · Mar 5, 2024 · 07a4de1 · 07a4de1
2 parents ab2d7b4 + 1b79f58
commit 07a4de1
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp
@@ -40,8 +40,18 @@
 #include "../mat4x3.hpp"
 #include "../mat4x4.hpp"
 
-#if __cplusplus < 201103L
-#pragma message("GLM_GTX_hash requires C++11 standard library support")
+#if defined(_MSC_VER)
+    // MSVC uses _MSVC_LANG instead of __cplusplus
+    #if _MSVC_LANG < 201103L
+        #pragma message("GLM_GTX_hash requires C++11 standard library support")
+    #endif
+#elif defined(__GNUC__) || defined(__clang__)
+    // GNU and Clang use __cplusplus
+    #if __cplusplus < 201103L
+        #pragma message("GLM_GTX_hash requires C++11 standard library support")
+    #endif
+#else
+    #error "Unknown compiler"
 #endif
 
 #if GLM_LANG & GLM_LANG_CXX11