Fixed C++ language restriction using GLM_FORCE_CXX**

g-truc · Dec 10, 2014 · 4340f3f · 4340f3f
1 parent 635f607
commit 4340f3f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 23 deletions.
diff --git a/doc/glm.docx b/doc/glm.docx
diff --git a/doc/glm.pdf b/doc/glm.pdf
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
@@ -329,7 +329,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 // C++ Version
 
-// User defines: GLM_FORCE_CXX98, GLM_FORCE_CXX11, GLM_FORCE_CXX14
+// User defines: GLM_FORCE_CXX98, GLM_FORCE_CXX03, GLM_FORCE_CXX11, GLM_FORCE_CXX14
 
 #define GLM_LANG_CXX98_FLAG (1 << 1)
 #define GLM_LANG_CXX03_FLAG (1 << 2)
@@ -351,15 +351,17 @@
 #define GLM_LANG_CXXMS GLM_LANG_CXXMS_FLAG
 #define GLM_LANG_CXXGNU GLM_LANG_CXXGNU_FLAG
 
-#if defined(GLM_FORCE_CXX1Z)
-# define GLM_LANG GLM_LANG_CXX1Z
-#elif defined(GLM_FORCE_CXX14)
+#if defined(GLM_FORCE_CXX14)
+# undef GLM_FORCE_CXX11
+# undef GLM_FORCE_CXX03
+# undef GLM_FORCE_CXX98
 # define GLM_LANG GLM_LANG_CXX14
-#elif defined(GLM_FORCE_CXX1Y)
-# define GLM_LANG GLM_LANG_CXX1Y
 #elif defined(GLM_FORCE_CXX11)
+# undef GLM_FORCE_CXX03
+# undef GLM_FORCE_CXX98
 # define GLM_LANG GLM_LANG_CXX11
 #elif defined(GLM_FORCE_CXX03)
+# undef GLM_FORCE_CXX98
 # define GLM_LANG GLM_LANG_CXX03
 #elif defined(GLM_FORCE_CXX98)
 # define GLM_LANG GLM_LANG_CXX98
@@ -504,91 +506,91 @@
 // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
 
 // N1720
-#define GLM_HAS_CXX11_STL ((GLM_PLATFORM != GLM_PLATFORM_ANDROID) && (\
+#define GLM_HAS_CXX11_STL !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ((GLM_PLATFORM != GLM_PLATFORM_ANDROID) && (\
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)) || \
  __has_include(<__config>)))
 
 // N1720
-#define GLM_HAS_STATIC_ASSERT ( \
+#define GLM_HAS_STATIC_ASSERT !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2010)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC43)) || \
  __has_feature(cxx_static_assert))
 
 // N1988
-#define GLM_HAS_EXTENDED_INTEGER_TYPE ( \
+#define GLM_HAS_EXTENDED_INTEGER_TYPE !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC43)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_LLVM) && (GLM_COMPILER >= GLM_COMPILER_LLVM30)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_APPLE_CLANG) && (GLM_COMPILER >= GLM_COMPILER_APPLE_CLANG40)))
 
 // N2235
-#define GLM_HAS_CONSTEXPR ( \
+#define GLM_HAS_CONSTEXPR !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)) || \
  __has_feature(cxx_constexpr))
 
 // N2672
-#define GLM_HAS_INITIALIZER_LISTS ( \
+#define GLM_HAS_INITIALIZER_LISTS !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013))) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC44)) || \
  __has_feature(cxx_generalized_initializers))
 
 // N2544 Unrestricted unions
-#define GLM_HAS_UNRESTRICTED_UNIONS ( \
+#define GLM_HAS_UNRESTRICTED_UNIONS !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  (GLM_LANG & GLM_LANG_CXXMS_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)) || \
  __has_feature(cxx_unrestricted_unions))
 
 // N2346
-#define GLM_HAS_DEFAULTED_FUNCTIONS ( \
+#define GLM_HAS_DEFAULTED_FUNCTIONS !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC44)) || \
  __has_feature(cxx_defaulted_functions))
 
 // N2118
-#define GLM_HAS_RVALUE_REFERENCES ( \
+#define GLM_HAS_RVALUE_REFERENCES !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC43)) || \
  __has_feature(cxx_rvalue_references))
 
 // N2437
-#define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS ( \
+#define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL14)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC45)) || \
  __has_feature(cxx_explicit_conversions))
 
-#define GLM_HAS_STL_ARRAY ( \
+#define GLM_HAS_STL_ARRAY !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2010)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC43)))
 
-#define GLM_HAS_TEMPLATE_ALIASES ( \
+#define GLM_HAS_TEMPLATE_ALIASES !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013))) || \
  __has_feature(cxx_alias_templates))
 
-#define GLM_HAS_RANGE_FOR ( \
+#define GLM_HAS_RANGE_FOR !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012)) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)) || \
  __has_feature(cxx_range_for))
 
-#define GLM_HAS_ASSIGNABLE ( \
+#define GLM_HAS_ASSIGNABLE !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC49)))
 
-#define GLM_HAS_TRIVIAL_QUERIES ( \
+#define GLM_HAS_TRIVIAL_QUERIES !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
 
-#define GLM_HAS_MAKE_SIGNED ( \
+#define GLM_HAS_MAKE_SIGNED !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && ( \
  (GLM_LANG & GLM_LANG_CXX11_FLAG) || \
  ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
 
@@ -617,7 +619,7 @@
 #endif
 
 // Not standard
-#define GLM_HAS_ANONYMOUS_UNION (GLM_LANG & GLM_LANG_CXXMS_FLAG)
+#define GLM_HAS_ANONYMOUS_UNION !defined(GLM_FORCE_CXX98) && !defined(GLM_FORCE_CXX03) && (GLM_LANG & GLM_LANG_CXXMS_FLAG)
 
 ///////////////////////////////////////////////////////////////////////////////////
 // Platform 

diff --git a/readme.txt b/readme.txt
@@ -63,7 +63,7 @@ More informations in GLM manual:
 http://glm.g-truc.net/glm.pdf
 
 ================================================================================
-GLM 0.9.6.1: 2014-12-XX
+GLM 0.9.6.1: 2014-12-10
 --------------------------------------------------------------------------------
 Features:
 - Added GLM_LANG_CXX14_FLAG and GLM_LANG_CXX1Z_FLAG language feature flags
@@ -83,6 +83,7 @@ Fixes:
 - Fixed GLM_FORCE_SIZE_FUNC pragma message
 - Fixed C++98 only build
 - Fixed conflict between GTX_compatibility and GTC_quaternion #286
+- Fixed C++ language restriction using GLM_FORCE_CXX**
 
 ================================================================================
 GLM 0.9.6.0: 2014-11-30

diff --git a/test/gtx/gtx_quaternion.cpp b/test/gtx/gtx_quaternion.cpp
@@ -34,6 +34,7 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/transform.hpp>
 #include <glm/gtx/quaternion.hpp>
+#include <glm/gtx/compatibility.hpp>
 #include <glm/ext.hpp>
 
 int test_quat_fastMix()