Browse Source

Removed old compiler version

Christophe Riccio 9 years ago
parent
commit
4875f79eb0
4 changed files with 18 additions and 51 deletions
  1. 1 3
      glm/detail/_features.hpp
  2. 2 4
      glm/detail/func_matrix.hpp
  3. 15 35
      glm/detail/setup.hpp
  4. 0 9
      test/core/core_func_integer.cpp

+ 1 - 3
glm/detail/_features.hpp

@@ -251,9 +251,7 @@
 
 #if(GLM_COMPILER & GLM_COMPILER_GCC)
 
-#	if(GLM_COMPILER >= GLM_COMPILER_GCC43)
-#		define GLM_CXX11_STATIC_ASSERT
-#	endif
+#	define GLM_CXX11_STATIC_ASSERT
 
 #elif(GLM_COMPILER & GLM_COMPILER_CLANG)
 #	if(__has_feature(cxx_exceptions))

+ 2 - 4
glm/detail/func_matrix.hpp

@@ -120,10 +120,8 @@ namespace detail
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/transpose.xml">GLSL transpose man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
-#	if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC11))
-		template<typename T, precision P, template<typename, precision> class matType>
-		GLM_FUNC_DECL typename matType<T, P>::transpose_type transpose(matType<T, P> const & x);
-#	endif
+	template<typename T, precision P, template<typename, precision> class matType>
+	GLM_FUNC_DECL typename matType<T, P>::transpose_type transpose(matType<T, P> const & x);
 	
 	/// Return the determinant of a squared matrix.
 	/// 

+ 15 - 35
glm/detail/setup.hpp

@@ -188,28 +188,18 @@
 #		ifdef _MSC_EXTENSIONS
 #			if __cplusplus >= 201402L
 #				define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_CXXMS_FLAG)
-//#			elif GLM_COMPILER >= GLM_COMPILER_VC14
-//#				define GLM_LANG (GLM_LANG_CXX1Y | GLM_LANG_CXXMS_FLAG)
 #			elif __cplusplus >= 201103L
 #				define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_CXXMS_FLAG)
-#			elif GLM_COMPILER >= GLM_COMPILER_VC10
-#				define GLM_LANG (GLM_LANG_CXX0X | GLM_LANG_CXXMS_FLAG)
-#			elif __cplusplus >= 199711L
-#				define GLM_LANG (GLM_LANG_CXX98 | GLM_LANG_CXXMS_FLAG)
 #			else
-#				define GLM_LANG (GLM_LANG_CXX | GLM_LANG_CXXMS_FLAG)
+#				define GLM_LANG (GLM_LANG_CXX0X | GLM_LANG_CXXMS_FLAG)
 #			endif
 #		else
 #			if __cplusplus >= 201402L
 #				define GLM_LANG GLM_LANG_CXX14
 #			elif __cplusplus >= 201103L
 #				define GLM_LANG GLM_LANG_CXX11
-#			elif GLM_COMPILER >= GLM_COMPILER_VC10
-#				define GLM_LANG GLM_LANG_CXX0X
-#			elif __cplusplus >= 199711L
-#				define GLM_LANG GLM_LANG_CXX98
 #			else
-#				define GLM_LANG GLM_LANG_CXX
+#				define GLM_LANG GLM_LANG_CXX0X
 #			endif
 #		endif
 #	elif GLM_COMPILER & GLM_COMPILER_INTEL
@@ -322,7 +312,7 @@
 #	define GLM_HAS_EXTENDED_INTEGER_TYPE 1
 #else
 #	define GLM_HAS_EXTENDED_INTEGER_TYPE (\
-		((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC11)) || \
+		((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC)) || \
 		((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_CUDA)) || \
 		((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC)) || \
 		((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_CLANG)))
@@ -377,7 +367,7 @@
 #	define GLM_HAS_DEFAULTED_FUNCTIONS ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
 		((GLM_COMPILER & GLM_COMPILER_GCC)) || \
 		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \
-		((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL12)) || \
+		((GLM_COMPILER & GLM_COMPILER_INTEL)) || \
 		(GLM_COMPILER & GLM_COMPILER_CUDA)))
 #endif
 
@@ -389,8 +379,8 @@
 #else
 #	define GLM_HAS_RVALUE_REFERENCES ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
 		((GLM_COMPILER & GLM_COMPILER_GCC)) || \
-		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC11)) || \
-		((GLM_COMPILER & GLM_COMPILER_CUDA) && (GLM_COMPILER >= GLM_COMPILER_CUDA50))))
+		((GLM_COMPILER & GLM_COMPILER_VC)) || \
+		((GLM_COMPILER & GLM_COMPILER_CUDA))))
 #endif
 
 // N2437 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2437.pdf
@@ -400,10 +390,10 @@
 #	define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS 1
 #else
 #	define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
-		((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC45)) || \
+		((GLM_COMPILER & GLM_COMPILER_GCC)) || \
 		((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL14)) || \
 		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \
-		((GLM_COMPILER & GLM_COMPILER_CUDA) && (GLM_COMPILER >= GLM_COMPILER_CUDA50))))
+		((GLM_COMPILER & GLM_COMPILER_CUDA))))
 #endif
 
 // N2258 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf
@@ -413,10 +403,10 @@
 #	define GLM_HAS_TEMPLATE_ALIASES 1
 #else
 #	define GLM_HAS_TEMPLATE_ALIASES ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
-		((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL12_1)) || \
+		((GLM_COMPILER & GLM_COMPILER_INTEL)) || \
 		((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC47)) || \
 		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \
-		((GLM_COMPILER & GLM_COMPILER_CUDA) && (GLM_COMPILER >= GLM_COMPILER_CUDA50))))
+		((GLM_COMPILER & GLM_COMPILER_CUDA))))
 #endif
 
 // N2930 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2930.html
@@ -427,9 +417,9 @@
 #else
 #	define GLM_HAS_RANGE_FOR ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
 		((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)) || \
-		((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL13)) || \
-		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC11)) || \
-		((GLM_COMPILER & GLM_COMPILER_CUDA) && (GLM_COMPILER >= GLM_COMPILER_CUDA50))))
+		((GLM_COMPILER & GLM_COMPILER_INTEL)) || \
+		((GLM_COMPILER & GLM_COMPILER_VC)) || \
+		((GLM_COMPILER & GLM_COMPILER_CUDA))))
 #endif
 
 // N2341 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2341.pdf
@@ -468,7 +458,7 @@
 #else
 #	define GLM_HAS_MAKE_SIGNED ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
 		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \
-		((GLM_COMPILER & GLM_COMPILER_CUDA) && (GLM_COMPILER >= GLM_COMPILER_CUDA50))))
+		((GLM_COMPILER & GLM_COMPILER_CUDA))))
 #endif
 
 #if GLM_ARCH == GLM_ARCH_PURE
@@ -488,10 +478,6 @@
 #			define GLM_HAS_OPENMP 40
 #		elif GLM_COMPILER >= GLM_COMPILER_GCC47
 #			define GLM_HAS_OPENMP 31
-#		elif GLM_COMPILER >= GLM_COMPILER_GCC44
-#			define GLM_HAS_OPENMP 30
-#		elif GLM_COMPILER >= GLM_COMPILER_GCC42
-#			define GLM_HAS_OPENMP 25
 #		else
 #			define GLM_HAS_OPENMP 0
 #		endif
@@ -502,16 +488,10 @@
 #			define GLM_HAS_OPENMP 0
 #		endif
 #	elif GLM_COMPILER & GLM_COMPILER_VC
-#		if GLM_COMPILER >= GLM_COMPILER_VC10
-#			define GLM_HAS_OPENMP 20
-#		else
-#			define GLM_HAS_OPENMP 0
-#		endif
+#		define GLM_HAS_OPENMP 20
 #	elif GLM_COMPILER & GLM_COMPILER_INTEL
 #		if GLM_COMPILER >= GLM_COMPILER_INTEL16
 #			define GLM_HAS_OPENMP 40
-#		elif GLM_COMPILER >= GLM_COMPILER_INTEL12
-#			define GLM_HAS_OPENMP 31
 #		else
 #			define GLM_HAS_OPENMP 0
 #		endif

+ 0 - 9
test/core/core_func_integer.cpp

@@ -256,14 +256,6 @@ namespace bitfieldReverse
 
 	typedef type<glm::uint64> typeU64;
 
-#if(((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC) && (GLM_COMPILER < GLM_COMPILER_GCC44))
-	typeU64 const Data64[] =
-	{
-		{0xf000000000000000LLU, 0x000000000000000fLLU, SUCCESS},
-		{0xffffffffffffffffLLU, 0xffffffffffffffffLLU, SUCCESS},
-		{0x0000000000000000LLU, 0x0000000000000000LLU, SUCCESS}
-	};
-#else
 	typeU64 const Data64[] =
 	{
 		{0x00000000000000ff, 0xff00000000000000, SUCCESS},
@@ -272,7 +264,6 @@ namespace bitfieldReverse
 		{0xffffffffffffffff, 0xffffffffffffffff, SUCCESS},
 		{0x0000000000000000, 0x0000000000000000, SUCCESS}
 	};
-#endif
 
 	int test32_bitfieldReverse()
 	{