From 6a6b54b6990cdc0d9b315d2d82d8828c3087a5b0 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Sat, 16 Jul 2016 22:34:07 +0200
Subject: [PATCH] Fixed long long warnings, fixed precision qualifier values on
 Clang where qualifiers had the same values

---
 glm/detail/precision.hpp |  6 +++---
 glm/detail/type_int.hpp  | 27 ---------------------------
 test/gtx/gtx_io.cpp      |  9 ++++++---
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/glm/detail/precision.hpp b/glm/detail/precision.hpp
index 2869cc69..8b1e2929 100644
--- a/glm/detail/precision.hpp
+++ b/glm/detail/precision.hpp
@@ -10,13 +10,13 @@ namespace glm
 		highp,
 		mediump,
 		lowp,
+		aligned_highp,
+		aligned_mediump,
+		aligned_lowp,
 		packed_highp = highp,
 		packed_mediump = mediump,
 		packed_lowp = lowp,
 		packed = packed_highp,
-		aligned_highp,
-		aligned_mediump,
-		aligned_lowp,
 		aligned = aligned_highp,
 #		ifdef GLM_FORCE_ALIGNED
 			defaultp = aligned_highp
diff --git a/glm/detail/type_int.hpp b/glm/detail/type_int.hpp
index b82cc8c3..56939255 100644
--- a/glm/detail/type_int.hpp
+++ b/glm/detail/type_int.hpp
@@ -35,23 +35,15 @@ namespace detail
 			typedef unsigned __int64		uint64;
 	
 #		elif GLM_COMPILER & GLM_COMPILER_GCC
-#			pragma GCC diagnostic push
 #			pragma GCC diagnostic ignored "-Wno-long-long"
-	
 			__extension__ typedef signed long long		sint64;
 			__extension__ typedef unsigned long long	uint64;
-		
-#			pragma GCC diagnostic pop
 	
 #		elif (GLM_COMPILER & GLM_COMPILER_CLANG)
-#			pragma clang diagnostic push
 #			pragma clang diagnostic ignored "-Wc++11-long-long"
-
 			typedef signed long	long		sint64;
 			typedef unsigned long long		uint64;
 	
-#			pragma clang diagnostic pop
-	
 #		else//unknown compiler
 			typedef signed long	long		sint64;
 			typedef unsigned long long		uint64;
@@ -184,16 +176,6 @@ namespace detail
 		{
 			typedef unsigned long type;
 		};
-	
-#		if GLM_COMPILER & GLM_COMPILER_GCC
-#			pragma GCC diagnostic push
-#			pragma GCC diagnostic ignored "-Wno-long-long"
-#		endif
-	
-#		if GLM_COMPILER & GLM_COMPILER_CLANG
-#			pragma clang diagnostic push
-#			pragma clang diagnostic ignored "-Wc++11-long-long"
-#		endif
 
 		template <>
 		struct make_signed<long long>
@@ -218,15 +200,6 @@ namespace detail
 		{
 			typedef unsigned long long type;
 		};
-
-#		if GLM_COMPILER & GLM_COMPILER_GCC
-#			pragma GCC diagnostic pop
-#		endif
-	
-#		if GLM_COMPILER & GLM_COMPILER_CLANG
-#			pragma clang diagnostic pop
-#		endif
-	
 #	endif//GLM_HAS_MAKE_SIGNED
 }//namespace detail
 
diff --git a/test/gtx/gtx_io.cpp b/test/gtx/gtx_io.cpp
index 5b05df58..8b0b12fa 100644
--- a/test/gtx/gtx_io.cpp
+++ b/test/gtx/gtx_io.cpp
@@ -14,9 +14,12 @@ namespace
 		if (cerberus)
 		{
 			switch (a) {
-			case glm::highp:   os << "hi"; break;
-			case glm::mediump: os << "md"; break;
-			case glm::lowp:    os << "lo"; break;
+			case glm::highp:			os << "uhi"; break;
+			case glm::mediump:			os << "umd"; break;
+			case glm::lowp:				os << "ulo"; break;
+			case glm::aligned_highp:	os << "ahi"; break;
+			case glm::aligned_mediump:	os << "amd"; break;
+			case glm::aligned_lowp:		os << "alo"; break;
 			}
 		}