From 90b74f1106ddc5eca8b3fe8617a2b24afd101ce9 Mon Sep 17 00:00:00 2001
From: sharkautarch <128002472+sharkautarch@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:59:42 -0400
Subject: [PATCH] simd constexpr vec: fix a couple more compile errors

---
 glm/detail/simd_constexpr/vec.hpp | 2 +-
 glm/detail/type_vec2.hpp          | 2 +-
 glm/detail/type_vec3.hpp          | 2 +-
 glm/detail/type_vec4.hpp          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/glm/detail/simd_constexpr/vec.hpp b/glm/detail/simd_constexpr/vec.hpp
index b50626aa..064c830f 100644
--- a/glm/detail/simd_constexpr/vec.hpp
+++ b/glm/detail/simd_constexpr/vec.hpp
@@ -30,7 +30,7 @@ namespace glm
 	concept arithmetic = std::integral<T> || std::floating_point<T>;
 	template <typename T0, typename... T>
 	consteval bool SameArithmeticTypes() {
-		return (std::is_same_v<std::common_type_t<T0,T>, T> && ...);
+		return (std::is_same_v<std::common_type_t<T0,T>, std::common_type_t<T0,T>> && ...);
 	}
 	template <typename... T>
 	consteval bool NotSameArithmeticTypes() {
diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp
index 44fbf838..e8e043a7 100644
--- a/glm/detail/type_vec2.hpp
+++ b/glm/detail/type_vec2.hpp
@@ -1,9 +1,9 @@
 /// @ref core
 /// @file glm/detail/type_vec2.hpp
-#if GLM_SIMD_CONSTEXPR == 0
 #pragma once
 
 #include "qualifier.hpp"
+#if GLM_SIMD_CONSTEXPR == 0
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #	include "_swizzle.hpp"
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION
diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp
index 6da38c19..f2a2a6d6 100644
--- a/glm/detail/type_vec3.hpp
+++ b/glm/detail/type_vec3.hpp
@@ -1,9 +1,9 @@
 /// @ref core
 /// @file glm/detail/type_vec3.hpp
-#if GLM_SIMD_CONSTEXPR == 0
 #pragma once
 
 #include "qualifier.hpp"
+#if GLM_SIMD_CONSTEXPR == 0
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #	include "_swizzle.hpp"
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION
diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp
index 5891f941..9f02f03b 100644
--- a/glm/detail/type_vec4.hpp
+++ b/glm/detail/type_vec4.hpp
@@ -1,9 +1,9 @@
 /// @ref core
 /// @file glm/detail/type_vec4.hpp
-#if GLM_SIMD_CONSTEXPR == 0
 #pragma once
 
 #include "qualifier.hpp"
+#if GLM_SIMD_CONSTEXPR == 0
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #	include "_swizzle.hpp"
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION
@@ -513,4 +513,4 @@ namespace glm
 #include "type_vec4.inl"
 #endif//GLM_EXTERNAL_TEMPLATE
 
-#endif
\ No newline at end of file
+#endif