From 0df4b94c4b8b2ae788479588726432a6c4d6abd2 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Thu, 14 Feb 2013 01:08:24 +0100
Subject: [PATCH] Fixed CUDA warnings and errors, #43

---
 glm/core/func_geometric.inl |  3 +--
 glm/core/type_half.hpp      | 30 +++++++++++++++---------------
 glm/core/type_mat3x2.hpp    |  4 ++--
 glm/core/type_mat4x4.inl    |  2 +-
 readme.txt                  |  1 +
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/glm/core/func_geometric.inl b/glm/core/func_geometric.inl
index 1923d05d..731b51c1 100644
--- a/glm/core/func_geometric.inl
+++ b/glm/core/func_geometric.inl
@@ -132,7 +132,6 @@ namespace glm
 	(
 		genType const & x, 
 		genType const & y
-        
 	)
 	{
 		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'dot' only accept floating-point inputs");
@@ -271,7 +270,7 @@ namespace glm
 
 	// reflect
 	template <typename genType>
-	genType reflect
+	GLM_FUNC_QUALIFIER genType reflect
 	(
 		genType const & I, 
 		genType const & N
diff --git a/glm/core/type_half.hpp b/glm/core/type_half.hpp
index 015c701a..816f601e 100644
--- a/glm/core/type_half.hpp
+++ b/glm/core/type_half.hpp
@@ -36,8 +36,8 @@ namespace detail
 {
 	typedef short hdata;
 
-	float toFloat32(hdata value);
-	hdata toFloat16(float const & value);
+	GLM_FUNC_DECL float toFloat32(hdata value);
+	GLM_FUNC_DECL hdata toFloat16(float const & value);
 
 	class half
 	{
@@ -71,42 +71,42 @@ namespace detail
 		hdata data;
 	};
 
-	half operator+ (half const & s1, half const & s2);
+	GLM_FUNC_DECL half operator+ (half const & s1, half const & s2);
 
-	half operator- (half const & s1, half const & s2);
+	GLM_FUNC_DECL half operator- (half const & s1, half const & s2);
 
-	half operator* (half const & s1, half const & s2);
+	GLM_FUNC_DECL half operator* (half const & s1, half const & s2);
 
-	half operator/ (half const & s1, half const & s2);
+	GLM_FUNC_DECL half operator/ (half const & s1, half const & s2);
 
 	// Unary constant operators
-	half operator- (half const & s);
+	GLM_FUNC_DECL half operator- (half const & s);
 
-	half operator-- (half const & s, int);
+	GLM_FUNC_DECL half operator-- (half const & s, int);
 
-	half operator++ (half const & s, int);
+	GLM_FUNC_DECL half operator++ (half const & s, int);
 
-	bool operator==(
+	GLM_FUNC_DECL bool operator==(
 		detail::half const & x, 
 		detail::half const & y);
 
-	bool operator!=(
+	GLM_FUNC_DECL bool operator!=(
 		detail::half const & x, 
 		detail::half const & y);
 
-	bool operator<(
+	GLM_FUNC_DECL bool operator<(
 		detail::half const & x, 
 		detail::half const & y);
 
-	bool operator<=(
+	GLM_FUNC_DECL bool operator<=(
 		detail::half const & x, 
 		detail::half const & y);
 
-	bool operator>(
+	GLM_FUNC_DECL bool operator>(
 		detail::half const & x, 
 		detail::half const & y);
 
-	bool operator>=(
+	GLM_FUNC_DECL bool operator>=(
 		detail::half const & x, 
 		detail::half const & y);
 
diff --git a/glm/core/type_mat3x2.hpp b/glm/core/type_mat3x2.hpp
index ad985b8e..22600c85 100644
--- a/glm/core/type_mat3x2.hpp
+++ b/glm/core/type_mat3x2.hpp
@@ -154,12 +154,12 @@ namespace detail
 	tmat3x2<T> operator+ (
 		tmat3x2<T> const & m, 
 		typename tmat3x2<T>::value_type const & s);
-	    
+
 	template <typename T> 
 	tmat3x2<T> operator+ (
 		tmat3x2<T> const & m1, 
 		tmat3x2<T> const & m2);
-	    
+
 	template <typename T> 
 	tmat3x2<T> operator- (
 		tmat3x2<T> const & m, 
diff --git a/glm/core/type_mat4x4.inl b/glm/core/type_mat4x4.inl
index e796506f..bed08758 100644
--- a/glm/core/type_mat4x4.inl
+++ b/glm/core/type_mat4x4.inl
@@ -191,7 +191,7 @@ namespace detail
 		X2 const & x2, Y2 const & y2, Z2 const & z2, W2 const & w2, 
 		X3 const & x3, Y3 const & y3, Z3 const & z3, W3 const & w3, 
 		X4 const & x4, Y4 const & y4, Z4 const & z4, W4 const & w4
-	)		
+	)
 	{
 		GLM_STATIC_ASSERT(detail::type<X1>::is_float || std::numeric_limits<X1>::is_integer, "*mat4x4 constructor only takes float and integer types, 1st parameter type invalid.");
 		GLM_STATIC_ASSERT(detail::type<Y1>::is_float || std::numeric_limits<Y1>::is_integer, "*mat4x4 constructor only takes float and integer types, 2nd parameter type invalid.");
diff --git a/readme.txt b/readme.txt
index bf3a807d..308e14c8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -49,6 +49,7 @@ GLM 0.9.4.2: 2013-02-14
 - Fixed 0x2013 dash character in comments that cause issue in Windows 
   Japanese mode
 - Fixed documentation warnings
+- Fixed CUDA warnings
 
 ================================================================================
 GLM 0.9.4.1: 2012-12-22