Browse Source

Merge pull request #1085 from jakubtyrcha/fix_msvc_compilation_cxx_20

Fixed MSVC compilation error with C++ 20 #1085
Christophe 3 years ago
parent
commit
df969513ae
1 changed files with 1 additions and 1 deletions
  1. 1 1
      glm/detail/type_vec1.inl

+ 1 - 1
glm/detail/type_vec1.inl

@@ -236,7 +236,7 @@ namespace glm
 	template<typename U>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator|=(vec<1, U, Q> const& v)
 	{
-		this->x |= U(v.x);
+		this->x |= static_cast<T>(v.x);
 		return *this;
 	}