|
|
@@ -359,7 +359,9 @@
|
|
|
#endif
|
|
|
|
|
|
// 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)
|
|
|
#elif GLM_LANG & GLM_LANG_CXX11_FLAG
|
|
|
# define GLM_HAS_DEFAULTED_FUNCTIONS 1
|
|
|
@@ -684,7 +686,7 @@
|
|
|
# define GLM_VECTOR_CALL
|
|
|
#endif//GLM_COMPILER
|
|
|
|
|
|
-#if GLM_HAS_DEFAULTED_FUNCTIONS && !defined(GLM_FORCE_UNRESTRICTED_GENTYPE)
|
|
|
+#if GLM_HAS_DEFAULTED_FUNCTIONS
|
|
|
# define GLM_DEFAULT = default
|
|
|
# ifdef GLM_FORCE_NO_CTOR_INIT
|
|
|
# define GLM_DEFAULT_CTOR = default
|
Christophe Riccio