Fixed specifier removal by 'std::make_pair<>' #333

g-truc · May 1, 2015 · df8cd22 · df8cd22
1 parent 5f784d8
commit df8cd22
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp
@@ -220,6 +220,12 @@ namespace glm
 		std::pair<tmat4x4<T,P> const,
 		tmat4x4<T,P> const> const &);
 
+	template <typename CTy, typename CTr, typename T, precision P>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(
+		std::basic_ostream<CTy,CTr> &,
+		std::pair<tmat4x4<T,P>,
+		tmat4x4<T,P>> const &);
+
 	/// @}
 }//namespace glm
 

diff --git a/glm/gtx/io.inl b/glm/gtx/io.inl
@@ -645,4 +645,12 @@ namespace io
 
 		return os;
 	}
+
+	template <typename CTy, typename CTr, typename T, precision P>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(
+		std::basic_ostream<CTy,CTr> & os,
+		std::pair<tmat4x4<T,P>, tmat4x4<T,P>> const& a)
+	{
+		return operator<<(os, static_cast<std::pair<tmat4x4<T,P> const, tmat4x4<T,P> const> const&>(a));
+	}
 }//namespace glm
diff --git a/readme.md b/readme.md
@@ -63,6 +63,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 ##### Fixes:
 - Fixed (u)int64 MSB/LSB handling on BE archs #306
 - Fixed multi-line comment warning in g++. #315
+- Fixed specifier removal by 'std::make_pair<>' #333
 
 ##### Deprecation:
 - Removed integer specification for 'mod' in GTC_integer #308