diff --git a/CMakeLists.txt b/CMakeLists.txt index b67c3a3b..3353543a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,8 +50,8 @@ if(GLM_TEST_ENABLE_MS_EXTENSIONS) if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")) add_definitions(-Wgnu-anonymous-struct) add_definitions(-Wnested-anon-types) - endif() -elseif() + endif() +else() if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") OR (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") AND WIN32)) add_definitions(/Za) elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")) diff --git a/doc/glm.docx b/doc/glm.docx index 89031673..553403c1 100644 Binary files a/doc/glm.docx and b/doc/glm.docx differ diff --git a/glm/detail/func_vector_relational.hpp b/glm/detail/func_vector_relational.hpp index f365b568..a1a409cf 100644 --- a/glm/detail/func_vector_relational.hpp +++ b/glm/detail/func_vector_relational.hpp @@ -130,20 +130,6 @@ namespace glm template class vecType> GLM_FUNC_DECL vecType not_(vecType const & v); -# if (GLM_COMPILER & GLM_COMPILER_VC && GLM_COMPILER >= GLM_COMPILER_VC2013)// || (GLM_COMPILER & GLM_COMPILER_APPLE_CLANG && GLM_COMPILER >= GLM_COMPILER_APPLE_CLANG60) - - /// Returns the component-wise logical complement of x. - /// /!\ Because of language incompatibilities between C++ and GLSL, GLM defines the function not but not_ instead. - /// - /// @tparam vecType Boolean vector types. - /// - /// @see GLSL not man page - /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions - template class vecType> - GLM_FUNC_DECL vecType not(vecType const & v){return not_(v);} - -# endif - /// @} }//namespace glm