diff --git a/doc/changelog.dox b/doc/changelog.dox index c1fe68d91..def12fd4b 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -466,6 +466,8 @@ See also: issues (see [mosra/magnum#421](https://github.com/mosra/magnum/issues/421)) - The library again compiles and tests cleanly with @ref CORRADE_NO_ASSERT enabled, and this setup is verified on the CI to avoid further regressions +- Worked around a regression in MSVC 2017 causing a compiler crash (see + [mosra/magnum#440](https://github.com/mosra/magnum/issues/440)) @subsection changelog-latest-bugfixes Bug fixes diff --git a/src/Magnum/Math/PackingBatch.cpp b/src/Magnum/Math/PackingBatch.cpp index 3dc9e7ae4..c0f8b7a7a 100644 --- a/src/Magnum/Math/PackingBatch.cpp +++ b/src/Magnum/Math/PackingBatch.cpp @@ -281,7 +281,7 @@ static_assert(sizeof(HalfBaseTable) + sizeof(HalfShiftTable) == 1536, void unpackHalfInto(const Corrade::Containers::StridedArrayView2D& src, const Corrade::Containers::StridedArrayView2D& dst) { CORRADE_ASSERT(src.size() == dst.size(), "Math::unpackHalfInto(): wrong destination size, got" << dst.size() << "but expected" << src.size(), ); - CORRADE_ASSERT(src.template isContiguous<1>() && dst.isContiguous<1>(), + CORRADE_ASSERT(src.isContiguous<1>() && dst.isContiguous<1>(), "Math::unpackHalfInto(): second view dimension is not contiguous", ); /* Caching values to avoid inline function calls in debug builds */ @@ -306,7 +306,7 @@ void unpackHalfInto(const Corrade::Containers::StridedArrayView2D& src, const Corrade::Containers::StridedArrayView2D& dst) { CORRADE_ASSERT(src.size() == dst.size(), "Math::packHalfInto(): wrong destination size, got" << dst.size() << "but expected" << src.size(), ); - CORRADE_ASSERT(src.template isContiguous<1>() && dst.isContiguous<1>(), + CORRADE_ASSERT(src.isContiguous<1>() && dst.isContiguous<1>(), "Math::packHalfInto(): second view dimension is not contiguous", ); /* Caching values to avoid inline function calls in debug builds */