From e26b0587b25f0910ff1a40197cfe2eee30cf0d4d Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Thu, 28 Jun 2012 17:01:02 +0100
Subject: [PATCH] Deleted VIRTREV_xstream

---
 CMakeLists.txt          | 9 ++++-----
 glm/core/setup.hpp      | 7 ++++++-
 glm/core/type_vec3.hpp  | 3 ++-
 glm/gtc/half_float.hpp  | 4 ++--
 glm/gtc/half_float.inl  | 4 ++--
 glm/virtrev/xstream.hpp | 4 ++--
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 549b183f..bb598a91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,11 +14,9 @@ endif()
 option(GLM_TEST_ENABLE_CXX_11 "Enable C++ 11" OFF)
 if(GLM_TEST_ENABLE_CXX_11)
 	if(CMAKE_COMPILER_IS_GNUCXX)
-		add_definitions(-std=c++11)
+		add_definitions(-std=c++0x)
 	endif()
 elseif(NOT GLM_TEST_ENABLE_CXX_11)
-	add_definitions(-DGLM_FORCE_CXX98)
-
 	if(CMAKE_COMPILER_IS_GNUCXX)
 		add_definitions(-std=c++98)
 	endif()
@@ -27,8 +25,9 @@ endif()
 option(GLM_TEST_ENABLE_MS_EXTENSIONS "Enable MS extensions" OFF)
 if(GLM_TEST_ENABLE_MS_EXTENSIONS)
 	if(CMAKE_COMPILER_IS_GNUCXX)
-		add_definitions(-fms-extensions)
-		add_definitions(-D_MSC_EXTENSIONS)
+		#Doesn't seem to work...
+		#add_definitions(-fms-extensions)
+		#add_definitions(-D_MSC_EXTENSIONS)
 	endif()
 elseif(NOT GLM_TEST_ENABLE_MS_EXTENSIONS)
 	if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp
index c4d439a4..b6bc7de3 100644
--- a/glm/core/setup.hpp
+++ b/glm/core/setup.hpp
@@ -430,6 +430,8 @@
 #		define GLM_LANG GLM_LANG_CXX0X
 #	elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && defined(_MSC_EXTENSIONS))
 #		define GLM_LANG GLM_LANG_CXXMS
+#	elif(((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC) && defined(_MSC_EXTENSIONS))
+#		define GLM_LANG GLM_LANG_CXXMS
 #	elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && !defined(_MSC_EXTENSIONS))
 #		if(GLM_COMPILER >= GLM_COMPILER_VC2010)
 #			define GLM_LANG GLM_LANG_CXX0X
@@ -563,8 +565,11 @@
 #define GLM_SUPPORT_ANONYMOUS_UNION() \
 	((GLM_LANG & GLM_LANG_CXX98) == GLM_LANG_CXX98)
 
+//#define GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE() \
+//	(((GLM_LANG & GLM_LANG_CXX11) == GLM_LANG_CXX11) || ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_LANG & GLM_LANG_CXXMS) == GLM_LANG_CXXMS) || ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_LANG == GLM_LANG_CXX0X)))
+
 #define GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE() \
-	(((GLM_LANG & GLM_LANG_CXX11) == GLM_LANG_CXX11) || ((GLM_LANG & GLM_LANG_CXXMS) == GLM_LANG_CXXMS) || ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_LANG == GLM_LANG_CXX0X)))
+	(((GLM_LANG & GLM_LANG_CXX11) == GLM_LANG_CXX11) || ((GLM_COMPILER & GLM_COMPILER_VC) && ((GLM_LANG & GLM_LANG_CXXMS) == GLM_LANG_CXXMS)) || ((GLM_LANG == GLM_LANG_CXX0X) == GLM_LANG_CXX0X))
 
 #define GLM_SUPPORT_SWIZZLE_OPERATOR() \
 	(/*defined(GLM_SWIZZLE) && */GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())
diff --git a/glm/core/type_vec3.hpp b/glm/core/type_vec3.hpp
index 3177b342..6468922d 100644
--- a/glm/core/type_vec3.hpp
+++ b/glm/core/type_vec3.hpp
@@ -84,12 +84,13 @@ namespace detail
 		union {value_type x, r, s;};
 		union {value_type y, g, t;};
 		union {value_type z, b, p;};
-
+/*
 #		if(defined(GLM_SWIZZLE))
 			// Defines all he swizzle operator as functions
 			GLM_SWIZZLE_GEN_REF_FROM_VEC3(T, detail::tvec3, detail::tref2, detail::tref3)
 			GLM_SWIZZLE_GEN_VEC_FROM_VEC3(T, detail::tvec3, detail::tvec2, detail::tvec3, detail::tvec4)
 #		endif//(defined(GLM_SWIZZLE))
+*/
 #	else //(GLM_COMPONENT == GLM_COMPONENT_ONLY_XYZW)
 		value_type x, y, z;
 
diff --git a/glm/gtc/half_float.hpp b/glm/gtc/half_float.hpp
index 30aabab6..5eb438d6 100644
--- a/glm/gtc/half_float.hpp
+++ b/glm/gtc/half_float.hpp
@@ -47,7 +47,7 @@
 namespace glm{
 namespace detail
 {
-#if(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())
+#if(GLM_COMPONENT == GLM_COMPONENT_CXX98)
 	template <>
 	struct tvec2<half>
 	{
@@ -345,7 +345,7 @@ namespace detail
 		tvec4<half> swizzle(comp X, comp Y, comp Z, comp W) const;
 		tref4<half> swizzle(comp X, comp Y, comp Z, comp W);
 	};
-#endif//(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())
+#endif//(GLM_COMPONENT == GLM_COMPONENT_CXX98)
 }
 //namespace detail
 
diff --git a/glm/gtc/half_float.inl b/glm/gtc/half_float.inl
index 8b504518..8a4a2c38 100644
--- a/glm/gtc/half_float.inl
+++ b/glm/gtc/half_float.inl
@@ -29,7 +29,7 @@
 namespace glm{
 namespace detail
 {
-#if(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())
+#if(GLM_COMPONENT == GLM_COMPONENT_CXX98)
 
 	//////////////////////////////////////
 	// hvec2
@@ -1003,7 +1003,7 @@ namespace detail
 			(*this)[w]);
 	}
 
-#endif//(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())
+#endif//(GLM_COMPONENT == GLM_COMPONENT_CXX98)
 
 }//namespace detail
 }//namespace glm
diff --git a/glm/virtrev/xstream.hpp b/glm/virtrev/xstream.hpp
index 7ef6bb97..79486cf4 100644
--- a/glm/virtrev/xstream.hpp
+++ b/glm/virtrev/xstream.hpp
@@ -46,7 +46,7 @@
 #if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #	pragma message("GLM: GLM_VIRTREV_xstream extension included")
 #endif
-
+/*
 namespace glm{
 namespace detail
 {
@@ -162,5 +162,5 @@ namespace detail
 
 }//namespace detail
 }//namespace glm
-
+*/
 #endif//GLM_VIRTREV_xstream