From 947527d3ac1910e62d142c76480293fee460603d Mon Sep 17 00:00:00 2001
From: Christophe <christophe.riccio@g-truc.net>
Date: Fri, 12 Jul 2019 23:11:27 +0200
Subject: [PATCH] Fixed string_cast, broken after fixing #916

---
 glm/gtx/string_cast.inl      | 26 +++++++++++++-------------
 test/gtx/gtx_string_cast.cpp |  1 +
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/glm/gtx/string_cast.inl b/glm/gtx/string_cast.inl
index 8c30532a..cb02d008 100644
--- a/glm/gtx/string_cast.inl
+++ b/glm/gtx/string_cast.inl
@@ -441,7 +441,7 @@ namespace detail
 	template<typename T, qualifier Q>
 	struct compute_to_string<qua<T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(qua<T, Q> const& x)
+		GLM_FUNC_QUALIFIER static std::string call(qua<T, Q> const& q)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -450,10 +450,10 @@ namespace detail
 				LiteralStr, LiteralStr, LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				static_cast<typename cast<T>::value_type>(x[0]),
-				static_cast<typename cast<T>::value_type>(x[1]),
-				static_cast<typename cast<T>::value_type>(x[2]),
-				static_cast<typename cast<T>::value_type>(x[3]));
+				static_cast<typename cast<T>::value_type>(q.w),
+				static_cast<typename cast<T>::value_type>(q.x),
+				static_cast<typename cast<T>::value_type>(q.y),
+				static_cast<typename cast<T>::value_type>(q.z));
 		}
 	};
 
@@ -470,14 +470,14 @@ namespace detail
 				LiteralStr, LiteralStr, LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				static_cast<typename cast<T>::value_type>(x.real[0]),
-				static_cast<typename cast<T>::value_type>(x.real[1]),
-				static_cast<typename cast<T>::value_type>(x.real[2]),
-				static_cast<typename cast<T>::value_type>(x.real[3]),
-				static_cast<typename cast<T>::value_type>(x.dual[0]),
-				static_cast<typename cast<T>::value_type>(x.dual[1]),
-				static_cast<typename cast<T>::value_type>(x.dual[2]),
-				static_cast<typename cast<T>::value_type>(x.dual[3]));
+				static_cast<typename cast<T>::value_type>(x.real.w),
+				static_cast<typename cast<T>::value_type>(x.real.x),
+				static_cast<typename cast<T>::value_type>(x.real.y),
+				static_cast<typename cast<T>::value_type>(x.real.z),
+				static_cast<typename cast<T>::value_type>(x.dual.w),
+				static_cast<typename cast<T>::value_type>(x.dual.x),
+				static_cast<typename cast<T>::value_type>(x.dual.y),
+				static_cast<typename cast<T>::value_type>(x.dual.z));
 		}
 	};
 
diff --git a/test/gtx/gtx_string_cast.cpp b/test/gtx/gtx_string_cast.cpp
index 2b7bb125..b04c8700 100644
--- a/test/gtx/gtx_string_cast.cpp
+++ b/test/gtx/gtx_string_cast.cpp
@@ -143,6 +143,7 @@ int test_string_cast_dual_quaternion()
 int main()
 {
 	int Error = 0;
+
 	Error += test_string_cast_vector();
 	Error += test_string_cast_matrix();
 	Error += test_string_cast_quaternion();