From 671ebd40eb38d497caaf067b8afa7f60ec533f85 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Sat, 22 Oct 2011 02:49:28 +0100
Subject: [PATCH] Fixed GCC 4.2.4 build

---
 CMakeLists.txt                  | 8 ++++----
 glm/glm.hpp                     | 2 +-
 test/core/core_func_integer.cpp | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93d9325b..ef490505 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,10 +11,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	#add_definitions(-pedantic)
 	#add_definitions(-S)
 	#add_definitions(-s)
-	add_definitions(-msse2)
-	add_definitions(-std=c++0x)
-	add_definitions(-fms-extensions)
-	add_definitions(-D_MSC_EXTENSIONS)
+	#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)
diff --git a/glm/glm.hpp b/glm/glm.hpp
index 79e1d878..55ee934a 100644
--- a/glm/glm.hpp
+++ b/glm/glm.hpp
@@ -84,7 +84,7 @@
 #include <climits>
 #include <cfloat>
 #include <limits>
-#include <type_traits>
+//#include <type_traits>
 #include "core/setup.hpp"
 
 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_CORE_INCLUDED_DISPLAYED))
diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp
index af2a9a2c..2b7008db 100644
--- a/test/core/core_func_integer.cpp
+++ b/test/core/core_func_integer.cpp
@@ -129,6 +129,9 @@ namespace bitRevert
 int main()
 {
 	int Error = 0;
+
+	//GLM_STATIC_ASSERT(sizeof(glm::uint64) == 2, "glm::uint64 isn't a 64 bits type");
+
 	Error += ::extractField::test();
 	Error += ::bitRevert::test();
 	return Error;