C++11 tests

ago%!(EXTRA string=14 years) · 1d05f79eb8
parent 156235e574
commit 1d05f79eb8
6 changed files with 22 additions and 17 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -13,6 +13,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	#add_definitions(-s)
 	add_definitions(-msse2)
 	add_definitions(-std=c++0x)
+	add_definitions(-fms-extensions)
+	add_definitions(-D_MSC_EXTENSIONS)
 	#add_definitions(-m32)
 	#add_definitions(-mfpmath=387)
 	#add_definitions(-ffast-math)
--- a/glm/core/type_vec2.hpp
+++ b/glm/core/type_vec2.hpp
@ -64,7 +64,7 @@ namespace detail

 #	if(GLM_COMPONENT == GLM_COMPONENT_ONLY_XYZW)
 		value_type x, y;
-#		elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT)
+#	elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT || GLM_LANG == GLM_LANG_CXX0X)
 		union 
 		{
            _GLM_SWIZZLE2_2_MEMBERS(value_type,glm::detail::tvec2<value_type>,x,y)
--- a/glm/core/type_vec4.hpp
+++ b/glm/core/type_vec4.hpp
@ -64,7 +64,7 @@ namespace detail

 #	if(GLM_COMPONENT == GLM_COMPONENT_ONLY_XYZW)
 		value_type x, y, z, w;
-#	elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT)
+#	elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT || GLM_LANG == GLM_LANG_CXX0X)
 		union 
 		{
 			_GLM_SWIZZLE4_2_MEMBERS(value_type,glm::detail::tvec2<value_type>,x,y,z,w)
--- a/glm/gtc/half_float.hpp
+++ b/glm/gtc/half_float.hpp
@ -47,7 +47,7 @@
 namespace glm{
 namespace detail
 {
-#ifndef _MSC_EXTENSIONS
+#if 0 //ndef _MSC_EXTENSIONS
 	template <>
 	struct tvec2<thalf>
 	{
--- a/glm/gtc/half_float.inl
+++ b/glm/gtc/half_float.inl
@ -29,7 +29,7 @@
 namespace glm{
 namespace detail{

-#ifndef _MSC_EXTENSIONS
+#if 0//ndef _MSC_EXTENSIONS

 //////////////////////////////////////
 // hvec2
--- a/test/core/core_type_vec3.cpp
+++ b/test/core/core_type_vec3.cpp
@ -9,6 +9,7 @@

 #include <glm/glm.hpp>
 #include <glm/gtc/half_float.hpp>
+#include <cstdio>

 static int test_vec3_operators()
 {
@ -251,5 +252,7 @@ int main()
    Error += test_vec3_swizzle_operators();
    Error += test_vec3_swizzle_functions();
 	
+	printf("Errors: %d\n", Error);
+
 	return Error;
 }