AuroraMiddleware/glm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.9.8'

Browse Source
This commit is contained in:
Christophe Riccio 2016-09-02 01:56:58 +02:00
commit 9cabe3b7bc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/detail/setup.hpp
View File

@ -353,7 +353,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
@ -664,7 +666,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