Fixed missing GLM_FUNC_DECL causing Cuda build errors #547

g-truc · Sep 11, 2016 · 3422dad · 3422dad
1 parent c983166
commit 3422dad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git 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,29 +114,29 @@ 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>
 		struct delimeter
 		{
 			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
@@ -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);