From df8cd2270691e0def85355b61004216b839301bf Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 1 May 2015 20:01:07 +0200 Subject: [PATCH] Fixed specifier removal by 'std::make_pair<>' #333 --- glm/gtx/io.hpp | 6 ++++++ glm/gtx/io.inl | 8 ++++++++ readme.md | 1 + 3 files changed, 15 insertions(+) diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp index b3842bbd..dcb706af 100644 --- a/glm/gtx/io.hpp +++ b/glm/gtx/io.hpp @@ -220,6 +220,12 @@ namespace glm std::pair const, tmat4x4 const> const &); + template + GLM_FUNC_DECL std::basic_ostream & operator<<( + std::basic_ostream &, + std::pair, + tmat4x4> const &); + /// @} }//namespace glm diff --git a/glm/gtx/io.inl b/glm/gtx/io.inl index 5af266dd..38202485 100644 --- a/glm/gtx/io.inl +++ b/glm/gtx/io.inl @@ -645,4 +645,12 @@ namespace io return os; } + + template + GLM_FUNC_QUALIFIER std::basic_ostream& operator<<( + std::basic_ostream & os, + std::pair, tmat4x4> const& a) + { + return operator<<(os, static_cast const, tmat4x4 const> const&>(a)); + } }//namespace glm diff --git a/readme.md b/readme.md index 6699d309..8e163cd0 100644 --- 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