mirror of
https://github.com/g-truc/glm.git
synced 2024-11-22 08:54:35 +00:00
Merge pull request #1085 from jakubtyrcha/fix_msvc_compilation_cxx_20
Fixed MSVC compilation error with C++ 20 #1085
This commit is contained in:
commit
df969513ae
@ -236,7 +236,7 @@ namespace glm
|
|||||||
template<typename U>
|
template<typename U>
|
||||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator|=(vec<1, U, Q> const& v)
|
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;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user