Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fixed GLM_FORCE_UNRESTRICTED_GENTYPE #543

Christophe Riccio 9 years ago
parent
e77c300e4c
commit
ff0054490d
1 changed files with 4 additions and 2 deletions
Unified View Show Diff Stats
  1. 4 2
      glm/detail/setup.hpp

+ 4 - 2
glm/detail/setup.hpp
View File 

@@ -359,7 +359,9 @@
 
 #endif
 
 #endif
 
 
 
 // N2346
 
 // N2346
 
-#if GLM_COMPILER & GLM_COMPILER_CLANG
 
+#if defined(GLM_FORCE_UNRESTRICTED_GENTYPE)
 
+#	define GLM_HAS_DEFAULTED_FUNCTIONS 0
 
+#elif GLM_COMPILER & GLM_COMPILER_CLANG
 
 #	define GLM_HAS_DEFAULTED_FUNCTIONS __has_feature(cxx_defaulted_functions)
 
 #	define GLM_HAS_DEFAULTED_FUNCTIONS __has_feature(cxx_defaulted_functions)
 
 #elif GLM_LANG & GLM_LANG_CXX11_FLAG
 
 #elif GLM_LANG & GLM_LANG_CXX11_FLAG
 
 #	define GLM_HAS_DEFAULTED_FUNCTIONS 1
 
 #	define GLM_HAS_DEFAULTED_FUNCTIONS 1
 
@@ -684,7 +686,7 @@
 
 #	define GLM_VECTOR_CALL
 
 #	define GLM_VECTOR_CALL
 
 #endif//GLM_COMPILER
 
 #endif//GLM_COMPILER
 
 
 
-#if GLM_HAS_DEFAULTED_FUNCTIONS && !defined(GLM_FORCE_UNRESTRICTED_GENTYPE)
 
+#if GLM_HAS_DEFAULTED_FUNCTIONS
 
 #	define GLM_DEFAULT = default
 
 #	define GLM_DEFAULT = default
 
 #	ifdef GLM_FORCE_NO_CTOR_INIT
 
 #	ifdef GLM_FORCE_NO_CTOR_INIT
 
 #		define GLM_DEFAULT_CTOR = default
 
 #		define GLM_DEFAULT_CTOR = default