From 206c4d7a9eb17a0c03b5e48d303097eeb58f1bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 30 Aug 2021 15:11:38 +0200 Subject: [PATCH] Trade: no need to type that much. --- src/Magnum/Trade/MeshData.cpp | 4 ++-- src/Magnum/Trade/MeshData.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Trade/MeshData.cpp b/src/Magnum/Trade/MeshData.cpp index 87235a63c..e78017daf 100644 --- a/src/Magnum/Trade/MeshData.cpp +++ b/src/Magnum/Trade/MeshData.cpp @@ -367,7 +367,7 @@ Containers::StridedArrayView1D MeshData::attributeDataViewInternal(c Containers::StridedArrayView2D MeshData::attribute(const UnsignedInt id) const { CORRADE_ASSERT(id < _attributes.size(), - "Trade::MeshData::attribute(): index" << id << "out of range for" << _attributes.size() << "attributes", nullptr); + "Trade::MeshData::attribute(): index" << id << "out of range for" << _attributes.size() << "attributes", {}); const MeshAttributeData& attribute = _attributes[id]; /* Build a 2D view using information about attribute type size */ return Containers::arrayCast<2, const char>( @@ -381,7 +381,7 @@ Containers::StridedArrayView2D MeshData::mutableAttribute(const UnsignedIn CORRADE_ASSERT(_vertexDataFlags & DataFlag::Mutable, "Trade::MeshData::mutableAttribute(): vertex data not mutable", {}); CORRADE_ASSERT(id < _attributes.size(), - "Trade::MeshData::mutableAttribute(): index" << id << "out of range for" << _attributes.size() << "attributes", nullptr); + "Trade::MeshData::mutableAttribute(): index" << id << "out of range for" << _attributes.size() << "attributes", {}); const MeshAttributeData& attribute = _attributes[id]; /* Build a 2D view using information about attribute type size */ const auto out = Containers::arrayCast<2, const char>( diff --git a/src/Magnum/Trade/MeshData.h b/src/Magnum/Trade/MeshData.h index 79a1b84e6..9dc7505ff 100644 --- a/src/Magnum/Trade/MeshData.h +++ b/src/Magnum/Trade/MeshData.h @@ -2121,7 +2121,7 @@ template Containers::ArrayView MeshData::indices() const { if(!data.stride()[1]) return {}; #endif CORRADE_ASSERT(Implementation::meshIndexTypeFor() == _indexType, - "Trade::MeshData::indices(): indices are" << _indexType << "but requested" << Implementation::meshIndexTypeFor(), nullptr); + "Trade::MeshData::indices(): indices are" << _indexType << "but requested" << Implementation::meshIndexTypeFor(), {}); return Containers::arrayCast<1, const T>(data).asContiguous(); } @@ -2133,7 +2133,7 @@ template Containers::ArrayView MeshData::mutableIndices() { if(!data.stride()[1]) return {}; #endif CORRADE_ASSERT(Implementation::meshIndexTypeFor() == _indexType, - "Trade::MeshData::mutableIndices(): indices are" << _indexType << "but requested" << Implementation::meshIndexTypeFor(), nullptr); + "Trade::MeshData::mutableIndices(): indices are" << _indexType << "but requested" << Implementation::meshIndexTypeFor(), {}); return Containers::arrayCast<1, T>(data).asContiguous(); }