From 27b0527fc03f5cc16989b3e5dbfe130c69c58712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 15 Jul 2021 15:27:37 +0200 Subject: [PATCH] Trade: use consistent naming in an assert message. --- src/Magnum/Trade/MeshData.h | 2 +- src/Magnum/Trade/Test/MeshDataTest.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Trade/MeshData.h b/src/Magnum/Trade/MeshData.h index 63e76bd68..6a19f91e1 100644 --- a/src/Magnum/Trade/MeshData.h +++ b/src/Magnum/Trade/MeshData.h @@ -524,7 +524,7 @@ class MAGNUM_TRADE_EXPORT MeshAttributeData { /* We're *sure* the view is correct, so faking the view size */ /** @todo better ideas for the StridedArrayView API? */ {_data.pointer, ~std::size_t{}}, _vertexCount, - (CORRADE_CONSTEXPR_ASSERT(!_isOffsetOnly, "Trade::MeshAttributeData::data(): the attribute is a relative offset, supply a data array"), _stride)}; + (CORRADE_CONSTEXPR_ASSERT(!_isOffsetOnly, "Trade::MeshAttributeData::data(): the attribute is offset-only, supply a data array"), _stride)}; } /** diff --git a/src/Magnum/Trade/Test/MeshDataTest.cpp b/src/Magnum/Trade/Test/MeshDataTest.cpp index c5f5ba99f..1169f45c7 100644 --- a/src/Magnum/Trade/Test/MeshDataTest.cpp +++ b/src/Magnum/Trade/Test/MeshDataTest.cpp @@ -795,11 +795,13 @@ void MeshDataTest::constructAttributeWrongDataAccess() { CORRADE_VERIFY(!a.isOffsetOnly()); CORRADE_VERIFY(b.isOffsetOnly()); + a.data(positionData); /* This is fine, no asserts */ + std::ostringstream out; Error redirectError{&out}; b.data(); CORRADE_COMPARE(out.str(), - "Trade::MeshAttributeData::data(): the attribute is a relative offset, supply a data array\n"); + "Trade::MeshAttributeData::data(): the attribute is offset-only, supply a data array\n"); } constexpr Vector2 ArrayVertexData[3*4]