From 5431212c55b846fff8d2b95bbd31ab3454ad4c3b Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Thu, 29 Sep 2011 16:49:50 +0100
Subject: [PATCH] Fixed /W4 warnings

---
 glm/core/func_packing.inl     |  2 +-
 glm/core/intrinsic_common.inl | 22 ++++++++++++----------
 glm/gtc/half_float.inl        |  7 +++----
 glm/gtx/ulp.inl               |  4 ++--
 test/core/core_type_half.cpp  |  6 +++---
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/glm/core/func_packing.inl b/glm/core/func_packing.inl
index 1e6ce6fa..303bde95 100644
--- a/glm/core/func_packing.inl
+++ b/glm/core/func_packing.inl
@@ -128,7 +128,7 @@ GLM_FUNC_QUALIFIER detail::tvec2<uint> unpackDouble2x32(double const & v)
 	return *(detail::tvec2<uint>*)&v;
 }
 
-GLM_FUNC_QUALIFIER uint packHalf2x16(vec2 const & v)
+GLM_FUNC_QUALIFIER uint packHalf2x16(detail::tvec2<float> const & v)
 {
 	detail::tvec2<detail::hdata> Pack(detail::toFloat16(v.x), detail::toFloat16(v.y));
 	return *(uint*)&Pack;
diff --git a/glm/core/intrinsic_common.inl b/glm/core/intrinsic_common.inl
index 8080bb35..471769fa 100644
--- a/glm/core/intrinsic_common.inl
+++ b/glm/core/intrinsic_common.inl
@@ -205,11 +205,13 @@ GLM_FUNC_QUALIFIER __m128 sse_mod_ps(__m128 x, __m128 y)
 }
 
 /// TODO
+/*
 GLM_FUNC_QUALIFIER __m128 sse_modf_ps(__m128 x, __m128i & i)
 {
 	__m128 empty;
     return empty;
 }
+*/
 
 //GLM_FUNC_QUALIFIER __m128 _mm_min_ps(__m128 x, __m128 y)
 
@@ -254,18 +256,18 @@ GLM_FUNC_QUALIFIER __m128 sse_ssp_ps(__m128 edge0, __m128 edge1, __m128 x)
 }
 
 /// \todo
-GLM_FUNC_QUALIFIER __m128 sse_nan_ps(__m128 x)
-{
-	__m128 empty;
-    return empty;
-}
+//GLM_FUNC_QUALIFIER __m128 sse_nan_ps(__m128 x)
+//{
+//	__m128 empty;
+//    return empty;
+//}
 
 /// \todo
-GLM_FUNC_QUALIFIER __m128 sse_inf_ps(__m128 x)
-{
-	__m128 empty;
-    return empty;
-}
+//GLM_FUNC_QUALIFIER __m128 sse_inf_ps(__m128 x)
+//{
+//	__m128 empty;
+//    return empty;
+//}
 
 // SSE scalar reciprocal sqrt using rsqrt op, plus one Newton-Rhaphson iteration
 // By Elan Ruskin, http://assemblyrequired.crashworks.org/
diff --git a/glm/gtc/half_float.inl b/glm/gtc/half_float.inl
index 32e1a341..92cb2fc5 100644
--- a/glm/gtc/half_float.inl
+++ b/glm/gtc/half_float.inl
@@ -20,7 +20,7 @@ GLM_FUNC_QUALIFIER tvec2<thalf>::size_type tvec2<thalf>::value_size()
 	return 2;
 }
 
-GLM_FUNC_QUALIFIER typename tvec2<thalf>::size_type tvec2<thalf>::length() const
+GLM_FUNC_QUALIFIER tvec2<thalf>::size_type tvec2<thalf>::length() const
 {
 	return 2;
 }
@@ -293,7 +293,7 @@ GLM_FUNC_QUALIFIER tvec3<thalf>::size_type tvec3<thalf>::value_size()
 	return 3;
 }
 
-GLM_FUNC_QUALIFIER typename tvec3<thalf>::size_type tvec3<thalf>::length() const
+GLM_FUNC_QUALIFIER tvec3<thalf>::size_type tvec3<thalf>::length() const
 {
 	return 3;
 }
@@ -610,8 +610,7 @@ GLM_FUNC_QUALIFIER tvec4<thalf>::size_type tvec4<thalf>::value_size()
 	return 4;
 }
 
-	
-GLM_FUNC_QUALIFIER typename tvec4<thalf>::size_type tvec4<thalf>::length() const
+GLM_FUNC_QUALIFIER tvec4<thalf>::size_type tvec4<thalf>::length() const
 {
 	return 4;
 }
diff --git a/glm/gtx/ulp.inl b/glm/gtx/ulp.inl
index 08d886a5..41a4bd9b 100644
--- a/glm/gtx/ulp.inl
+++ b/glm/gtx/ulp.inl
@@ -76,8 +76,8 @@ namespace detail
 		volatile float t;
 		glm::detail::int32 hx, hy, ix, iy;
 
-		GLM_GET_FLOAT_WORD(hx,x);
-		GLM_GET_FLOAT_WORD(hy,y);
+		GLM_GET_FLOAT_WORD(hx, x);
+		GLM_GET_FLOAT_WORD(hy, y);
 		ix = hx&0x7fffffff;             // |x|
 		iy = hy&0x7fffffff;             // |y|
 
diff --git a/test/core/core_type_half.cpp b/test/core/core_type_half.cpp
index 3468f357..37f59fde 100644
--- a/test/core/core_type_half.cpp
+++ b/test/core/core_type_half.cpp
@@ -18,13 +18,13 @@ int main()
 	glm::half B(2.0f);
 	glm::half C = A + B;
 	glm::half D(C);
-	float E = D;
-	int F = float(C);
+	float E(D);
+	int F(float(C));
 	glm::half G = B * C;
 	glm::half H = G / C;
 	H += glm::half(1.0f);
 	double J = H;
-	int I = float(H);
+	int I(float(H));
 
 	Result = Result && J == 3.0;