From 69c764eca9b0dc51b8f1ac72fd984d9acba23364 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <g.truc.creation@gmail.com>
Date: Tue, 26 Apr 2011 14:24:45 +0100
Subject: [PATCH] Fixed build

---
 glm/gtx/ulp.hpp      |  6 +++---
 glm/gtx/ulp.inl      | 24 ++++++++++++------------
 test/gtx/gtx-ulp.cpp |  8 ++++----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/glm/gtx/ulp.hpp b/glm/gtx/ulp.hpp
index fce68d73..d93c1990 100644
--- a/glm/gtx/ulp.hpp
+++ b/glm/gtx/ulp.hpp
@@ -24,7 +24,7 @@ namespace glm
 {
 	namespace gtx{
 	//! GLM_GTX_ulp extension: Precision calculation functions
-	namespace spline
+	namespace ulp
 	{
 		/// \addtogroup gtx_ulp
 		///@{
@@ -44,7 +44,7 @@ namespace glm
 
 #include "ulp.inl"
 
-namespace glm{using namespace gtx::spline;}
+namespace glm{using namespace gtx::ulp;}
 
-#endif//glm_gtx_spline
+#endif//glm_gtx_ulp
 
diff --git a/glm/gtx/ulp.inl b/glm/gtx/ulp.inl
index bd2e3430..b223e543 100644
--- a/glm/gtx/ulp.inl
+++ b/glm/gtx/ulp.inl
@@ -2,7 +2,7 @@
 // OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Created : 2011-03-07
-// Updated : 2011-03-07
+// Updated : 2011-04-26
 // Licence : This source is under MIT License
 // File    : glm/gtx/ulp.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -15,13 +15,13 @@ namespace ulp
 {
 	inline std::size_t ulp
 	(
-		half const & a,
-		half const & b
+		detail::thalf const & a,
+		detail::thalf const & b
 	)
 	{
 		std::size_t Count = 0;
-		float TempA = a;
-		float TempB = b;
+		float TempA(a);
+		float TempB(b);
 		while((TempA = nextafterf(TempA, TempB)) != TempB)
 			++Count;
 		return Count;
@@ -56,8 +56,8 @@ namespace ulp
 	template <typename T>
 	inline std::size_t ulp
 	(
-		detail::xvec2<T> const & a,
-		detail::xvec2<T> const & b
+		detail::tvec2<T> const & a,
+		detail::tvec2<T> const & b
 	)
 	{
         std::size_t ulps[] = 
@@ -66,14 +66,14 @@ namespace ulp
             ulp(a[1], b[1])
         };
 
-        return glm::max(ulps[0], ulps[1])s;
+        return glm::max(ulps[0], ulps[1]);
 	}
 
 	template <typename T>
 	inline std::size_t ulp
 	(
-		detail::xvec3<T> const & a,
-		detail::xvec3<T> const & b
+		detail::tvec3<T> const & a,
+		detail::tvec3<T> const & b
 	)
 	{
         std::size_t ulps[] = 
@@ -89,8 +89,8 @@ namespace ulp
 	template <typename T>
 	inline std::size_t ulp
 	(
-		detail::xvec4<T> const & a,
-		detail::xvec4<T> const & b
+		detail::tvec4<T> const & a,
+		detail::tvec4<T> const & b
 	)
 	{
         std::size_t ulps[] = 
diff --git a/test/gtx/gtx-ulp.cpp b/test/gtx/gtx-ulp.cpp
index ee1bd3e9..753f5729 100644
--- a/test/gtx/gtx-ulp.cpp
+++ b/test/gtx/gtx-ulp.cpp
@@ -13,10 +13,10 @@
 
 int test_ulp_float()
 {
-	std::size_t A = ulp(0.01, 0.02);
-	std::size_t B = ulp(glm::vec2(0.01), glm::vec2(0.02));
-	std::size_t C = ulp(glm::vec3(0.01), glm::vec3(0.02));
-	std::size_t D = ulp(glm::vec4(0.01), glm::vec4(0.02));
+	std::size_t A = glm::ulp(0.01, 0.02);
+	std::size_t B = glm::ulp(glm::vec2(0.01), glm::vec2(0.02));
+	std::size_t C = glm::ulp(glm::vec3(0.01), glm::vec3(0.02));
+	std::size_t D = glm::ulp(glm::vec4(0.01), glm::vec4(0.02));
 	std::cout << "glm::ulp test: " << A << std::endl;
 	std::cout << "glm::ulp test: " << B << std::endl;
 	std::cout << "glm::ulp test: " << C << std::endl;