mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 02:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1085 from jakubtyrcha/fix_msvc_compilation_cxx_20

Browse Source 
Fixed MSVC compilation error with C++ 20 #1085
This commit is contained in:
Christophe 2022-04-20 12:31:30 +02:00 committed by GitHub
commit df969513ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/detail/type_vec1.inl
View File

@ -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;
} }