mirror of
https://github.com/g-truc/glm.git
synced 2024-11-13 05:41:47 +00:00
added: 'operator<<(std::pair<tmat4x4<T,P>, tmat4x4<T,P>>)' routed to 'operator<<(std::pair<tmat4x4<T,P> const, tmat4x4<T,P> const>)' to avoid specifier removal by 'std::make_pair<>' and follow-up type-deduction problems; see [http://stackoverflow.com/questions/29985791/]
This commit is contained in:
parent
a472f50767
commit
e590111375
@ -214,12 +214,18 @@ namespace glm
|
|||||||
template <typename CTy, typename CTr, typename T, precision P>
|
template <typename CTy, typename CTr, typename T, precision P>
|
||||||
GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x4<T,P> const&);
|
GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x4<T,P> const&);
|
||||||
|
|
||||||
template <typename CTy, typename CTr, typename T, precision P>
|
template <typename CTy, typename CTr, typename T, precision P>
|
||||||
GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(
|
GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(
|
||||||
std::basic_ostream<CTy,CTr> &,
|
std::basic_ostream<CTy,CTr> &,
|
||||||
std::pair<tmat4x4<T,P> const,
|
std::pair<tmat4x4<T,P> const,
|
||||||
tmat4x4<T,P> const> 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
|
}//namespace glm
|
||||||
|
|
||||||
|
@ -605,7 +605,7 @@ namespace io
|
|||||||
|
|
||||||
return os;
|
return os;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename CTy, typename CTr, typename T, precision P>
|
template <typename CTy, typename CTr, typename T, precision P>
|
||||||
GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(
|
GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(
|
||||||
std::basic_ostream<CTy,CTr> & os,
|
std::basic_ostream<CTy,CTr> & os,
|
||||||
@ -645,4 +645,13 @@ namespace io
|
|||||||
|
|
||||||
return os;
|
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
|
}//namespace glm
|
||||||
|
Loading…
Reference in New Issue
Block a user