diff --git a/glm/detail/_swizzle_func_gcc_vec.hpp b/glm/detail/_swizzle_func_gcc_vec.hpp index be3415be..ced51e7b 100644 --- a/glm/detail/_swizzle_func_gcc_vec.hpp +++ b/glm/detail/_swizzle_func_gcc_vec.hpp @@ -8,7 +8,7 @@ G vin; std::memcpy(&vin, &data, std::min(sizeof(data), sizeof(vin))); \ GccVec<2, T, Q> vout; \ vout = __builtin_shufflevector(vin, vin, offsetof(E, A)/sizeof(A), offsetof(E, B)/sizeof(B)); \ - return vec<2, T, Q>(std::bit_cast::data_t>(vout)); \ + return vec<2, T, Q>(vout); \ } #define GLM_SWIZZLE_GEN_VEC3_ENTRY(L, T, Q, CONST, A, B, C) \ @@ -31,7 +31,7 @@ G vin; std::memcpy(&vin, &data, std::min(sizeof(data), sizeof(vin))); \ GccVec<4, T, Q> vout; \ vout=__builtin_shufflevector(vin, vin, offsetof(E, A)/sizeof(A), offsetof(E, B)/sizeof(B), offsetof(E, C)/sizeof(C), offsetof(E, D)/sizeof(D)); \ - return vec<4, T, Q>(std::bit_cast::data_t>(vout)); \ + return vec<4, T, Q>(vout); \ } #define GLM_SWIZZLE_GEN_VEC2_ENTRY_DEF(T, Q, L, CONST, A, B) \ diff --git a/glm/detail/simd_constexpr/vec.hpp b/glm/detail/simd_constexpr/vec.hpp index c56da018..58e91510 100644 --- a/glm/detail/simd_constexpr/vec.hpp +++ b/glm/detail/simd_constexpr/vec.hpp @@ -189,7 +189,7 @@ namespace glm GccVec_t condMask = std::bit_cast(elementArr); auto gv1 = std::bit_cast>(v1.elementArr); auto gv2 = std::bit_cast>(v2.elementArr); - return vec(std::bit_cast> ((condMask ? gv1 : gv2))); + return vec((condMask ? gv1 : gv2)); } template