Browse Source

Fixed test with VC and disabled lang extension

Christophe Riccio 11 years ago
parent
commit
4e95519396
3 changed files with 2 additions and 16 deletions
  1. 2 2
      CMakeLists.txt
  2. BIN
      doc/glm.docx
  3. 0 14
      glm/detail/func_vector_relational.hpp

+ 2 - 2
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"))
 	if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU"))
 		add_definitions(-Wgnu-anonymous-struct)
 		add_definitions(-Wgnu-anonymous-struct)
 		add_definitions(-Wnested-anon-types)
 		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))
 	if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") OR (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") AND WIN32))
 		add_definitions(/Za)
 		add_definitions(/Za)
 	elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU"))
 	elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU"))

BIN
doc/glm.docx


+ 0 - 14
glm/detail/func_vector_relational.hpp

@@ -130,20 +130,6 @@ namespace glm
 	template <precision P, template <typename, precision> class vecType>
 	template <precision P, template <typename, precision> class vecType>
 	GLM_FUNC_DECL vecType<bool, P> not_(vecType<bool, P> const & v);
 	GLM_FUNC_DECL vecType<bool, P> not_(vecType<bool, P> 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/not.xml">GLSL not man page</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-	template <precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<bool, P> not(vecType<bool, P> const & v){return not_(v);}
-
-#	endif
-
 	/// @}
 	/// @}
 }//namespace glm
 }//namespace glm