From ac8552d2967f6acb8fc9d429394b69a1a4c109cd Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Fri, 30 Sep 2011 14:37:49 +0100
Subject: [PATCH] Fixed /W4 VC warnings

---
 glm/core/intrinsic_common.inl | 5 +++++
 glm/gtx/ulp.inl               | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/glm/core/intrinsic_common.inl b/glm/core/intrinsic_common.inl
index 471769fa..12c9023f 100644
--- a/glm/core/intrinsic_common.inl
+++ b/glm/core/intrinsic_common.inl
@@ -10,6 +10,9 @@
 namespace glm{
 namespace detail{
 
+#pragma warning(push)
+#pragma warning(disable : 4510 4512 4610)
+
 	union ieee754_QNAN
 	{
 	   const float f;
@@ -21,6 +24,8 @@ namespace detail{
 	   ieee754_QNAN() : f(0.0)/*, mantissa(0x7FFFFF), exp(0xFF), sign(0x0)*/ {}
 	};
 
+#pragma warning(pop)
+
 	static const __m128 GLM_VAR_USED zero = _mm_setzero_ps();
 	static const __m128 GLM_VAR_USED one = _mm_set_ps1(1.0f);
 	static const __m128 GLM_VAR_USED minus_one = _mm_set_ps1(-1.0f);
diff --git a/glm/gtx/ulp.inl b/glm/gtx/ulp.inl
index 41a4bd9b..a0c53bef 100644
--- a/glm/gtx/ulp.inl
+++ b/glm/gtx/ulp.inl
@@ -21,6 +21,9 @@
  * ====================================================
  */
 
+#pragma warning(push)
+#pragma warning(disable : 4127)
+
 typedef union
 {
 	float value;
@@ -168,6 +171,8 @@ namespace detail
 }//namespace detail
 }//namespace glm
 
+#pragma warning(pop)
+
 #if(GLM_COMPILER & GLM_COMPILER_VC)
 #	define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward))
 #   define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward))