From 792151573c0ca65b21680060ed6cc9dade4701bb Mon Sep 17 00:00:00 2001 From: Christophe Riccio <christopheri@unity3d.com> Date: Wed, 18 May 2016 22:46:58 +0200 Subject: [PATCH] Fixed to_string when used with GLM_FORCE_INLINE #506 --- glm/gtx/string_cast.inl | 2 +- readme.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/glm/gtx/string_cast.inl b/glm/gtx/string_cast.inl index c21fa75fb..2a0434d88 100644 --- a/glm/gtx/string_cast.inl +++ b/glm/gtx/string_cast.inl @@ -479,7 +479,7 @@ namespace detail }//namespace detail template <template <typename, precision> class matType, typename T, precision P> -GLM_FUNC_DECL std::string to_string(matType<T, P> const & x) +GLM_FUNC_QUALIFIER std::string to_string(matType<T, P> const & x) { return detail::compute_to_string<matType, T, P>::call(x); } diff --git a/readme.md b/readme.md index 16944885a..ab4f1c348 100644 --- a/readme.md +++ b/readme.md @@ -56,6 +56,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Fixed uaddCarry warning #497 - Fixed roundPowerOfTwo and floorPowerOfTwo #503 - Fixed Visual C++ SIMD instruction set automatic detection in 64 bits +- Fixed to_string when used with GLM_FORCE_INLINE #506 #### [GLM 0.9.7.4](https://github.com/g-truc/glm/releases/tag/0.9.7.4) - 2016-03-19 ##### Fixes: