From d573bf099aa7b56ed0f3b6fd89419a8f5e9f7098 Mon Sep 17 00:00:00 2001
From: Gaoyang Zhang <gy@blurgy.xyz>
Date: Thu, 6 May 2021 14:12:23 +0800
Subject: [PATCH] Revert "Fix constructor of struct qua to honor macro
 "GLM_FORCE_QUAT_DATA_WXYZ""

This reverts commit f931c4996ab15a0e911b9d5247d0edaa3fa426d5.
---
 glm/detail/type_quat.hpp | 2 +-
 glm/detail/type_quat.inl | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/glm/detail/type_quat.hpp b/glm/detail/type_quat.hpp
index 0148abe8..daeaa707 100644
--- a/glm/detail/type_quat.hpp
+++ b/glm/detail/type_quat.hpp
@@ -88,7 +88,7 @@ namespace glm
 		// -- Explicit basic constructors --
 
 		GLM_FUNC_DECL GLM_CONSTEXPR qua(T s, vec<3, T, Q> const& v);
-		GLM_FUNC_DECL GLM_CONSTEXPR qua(T, T, T, T);
+		GLM_FUNC_DECL GLM_CONSTEXPR qua(T w, T x, T y, T z);
 
 		// -- Conversion constructors --
 
diff --git a/glm/detail/type_quat.inl b/glm/detail/type_quat.inl
index 8c0176c0..1956b7a0 100644
--- a/glm/detail/type_quat.inl
+++ b/glm/detail/type_quat.inl
@@ -141,11 +141,10 @@ namespace detail
 	{}
 
 	template <typename T, qualifier Q>
-#		ifdef GLM_FORCE_QUAT_DATA_WXYZ
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(T _w, T _x, T _y, T _z)
+#		ifdef GLM_FORCE_QUAT_DATA_WXYZ
 			: w(_w), x(_x), y(_y), z(_z)
 #		else
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(T _x, T _y, T _z, T _w)
 			: x(_x), y(_y), z(_z), w(_w)
 #		endif
 	{}