From 3422dad8cc82d9e692030b10780dbe2899b87a49 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christopheri@unity3d.com>
Date: Sun, 11 Sep 2016 02:47:18 +0200
Subject: [PATCH 1/2] Fixed missing GLM_FUNC_DECL causing Cuda build errors
 #547

---
 glm/gtx/io.hpp | 20 ++++++++++----------
 glm/gtx/io.inl |  6 ++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp
index 52b27a8f..f035a176 100644
--- a/glm/gtx/io.hpp
+++ b/glm/gtx/io.hpp
@@ -68,8 +68,8 @@ namespace glm
 
 		public:
 
-			explicit basic_state_saver(std::basic_ios<CTy,CTr>&);
-					~basic_state_saver();
+			GLM_FUNC_DECL explicit basic_state_saver(std::basic_ios<CTy,CTr>&);
+			GLM_FUNC_DECL ~basic_state_saver();
 
 		private:
 
@@ -86,7 +86,7 @@ namespace glm
 			char_type       fill_;
 			locale_type     locale_;
 
-			basic_state_saver& operator=(basic_state_saver const&);
+			GLM_FUNC_DECL basic_state_saver& operator=(basic_state_saver const&);
 		};
 
 		typedef basic_state_saver<char>     state_saver;
@@ -97,14 +97,14 @@ namespace glm
 		{
 		public:
 
-			explicit basic_format_saver(std::basic_ios<CTy,CTr>&);
-					~basic_format_saver();
+			GLM_FUNC_DECL explicit basic_format_saver(std::basic_ios<CTy,CTr>&);
+			GLM_FUNC_DECL ~basic_format_saver();
 
 		private:
 
 			basic_state_saver<CTy> const bss_;
 
-			basic_format_saver& operator=(basic_format_saver const&);
+			GLM_FUNC_DECL basic_format_saver& operator=(basic_format_saver const&);
 		};
 
 		typedef basic_format_saver<char>     format_saver;
@@ -114,14 +114,14 @@ namespace glm
 		{
 			unsigned value;
 
-			explicit precision(unsigned);
+			GLM_FUNC_DECL explicit precision(unsigned);
 		};
 
 		struct width
 		{
 			unsigned value;
 
-			explicit width(unsigned);
+			GLM_FUNC_DECL explicit width(unsigned);
 		};
 
 		template <typename CTy>
@@ -129,14 +129,14 @@ namespace glm
 		{
 			CTy value[3];
 
-			explicit delimeter(CTy /* left */, CTy /* right */, CTy /* separator */ = ',');
+			GLM_FUNC_DECL explicit delimeter(CTy /* left */, CTy /* right */, CTy /* separator */ = ',');
 		};
 
 		struct order
 		{
 			order_type value;
 
-			explicit order(order_type);
+			GLM_FUNC_DECL explicit order(order_type);
 		};
 
 		// functions, inlined (inline)
diff --git a/glm/gtx/io.inl b/glm/gtx/io.inl
index 849c0ca5..9b70a5fd 100644
--- a/glm/gtx/io.inl
+++ b/glm/gtx/io.inl
@@ -228,8 +228,7 @@ namespace detail
 namespace detail
 {
 	template <typename CTy, typename CTr, template <typename, precision> class M, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>&
-	print_matrix_on(std::basic_ostream<CTy, CTr>& os, M<T,P> const& a)
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& print_matrix_on(std::basic_ostream<CTy, CTr>& os, M<T,P> const& a)
 	{
 		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
 
@@ -371,8 +370,7 @@ namespace detail
 namespace detail
 {
 	template <typename CTy, typename CTr, template <typename, precision> class M, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>&
-	print_matrix_pair_on(std::basic_ostream<CTy, CTr>& os, std::pair<M<T, P> const, M<T, P> const> const& a)
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& print_matrix_pair_on(std::basic_ostream<CTy, CTr>& os, std::pair<M<T, P> const, M<T, P> const> const& a)
 	{
 		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
 

From d0712875d8c78ef3dfd84696a2790a980d6c90bf Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christopheri@unity3d.com>
Date: Sun, 11 Sep 2016 02:50:37 +0200
Subject: [PATCH 2/2] Added missing extensions

---
 glm/ext.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/glm/ext.hpp b/glm/ext.hpp
index ca2e9e82..82d65a1c 100644
--- a/glm/ext.hpp
+++ b/glm/ext.hpp
@@ -35,8 +35,10 @@
 #endif//GLM_MESSAGES
 
 #include "./gtc/bitfield.hpp"
+#include "./gtc/color_space.hpp"
 #include "./gtc/constants.hpp"
 #include "./gtc/epsilon.hpp"
+#include "./gtc/functions.hpp"
 #include "./gtc/integer.hpp"
 #include "./gtc/matrix_access.hpp"
 #include "./gtc/matrix_integer.hpp"
@@ -48,6 +50,7 @@
 #include "./gtc/random.hpp"
 #include "./gtc/reciprocal.hpp"
 #include "./gtc/round.hpp"
+#include "./gtc/type_aligned.hpp"
 #include "./gtc/type_precision.hpp"
 #include "./gtc/type_ptr.hpp"
 #include "./gtc/ulp.hpp"