Skip to content

Commit

Permalink
Merge pull request g-truc#1085 from jakubtyrcha/fix_msvc_compilation_…
Browse files Browse the repository at this point in the history
…cxx_20

Fixed MSVC compilation error with C++ 20 g-truc#1085
  • Loading branch information
christophe-lunarg committed Apr 20, 2022
2 parents c8f3357 + 318d7f2 commit df96951
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion glm/detail/type_vec1.inl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit df96951

Please sign in to comment.