Browse Source

Trade: remove redundant assertions in SceneData::mutable*().

The two functions delegate to another mutable{Mapping,Field}(), which
has the mutability assertion on its own, so it will fire nevertheless.
pull/601/head
Vladimír Vondruš 3 years ago
parent
commit
76a649b02b
  1. 4
      src/Magnum/Trade/SceneData.cpp

4
src/Magnum/Trade/SceneData.cpp

@ -1294,8 +1294,6 @@ Containers::StridedArrayView2D<const char> SceneData::mapping(const SceneField f
} }
Containers::StridedArrayView2D<char> SceneData::mutableMapping(const SceneField fieldName) { Containers::StridedArrayView2D<char> SceneData::mutableMapping(const SceneField fieldName) {
CORRADE_ASSERT(_dataFlags & DataFlag::Mutable,
"Trade::SceneData::mutableMapping(): data not mutable", {});
const UnsignedInt fieldId = findFieldIdInternal(fieldName); const UnsignedInt fieldId = findFieldIdInternal(fieldName);
CORRADE_ASSERT(fieldId != ~UnsignedInt{}, "Trade::SceneData::mutableMapping(): field" << fieldName << "not found", {}); CORRADE_ASSERT(fieldId != ~UnsignedInt{}, "Trade::SceneData::mutableMapping(): field" << fieldName << "not found", {});
return mutableMapping(fieldId); return mutableMapping(fieldId);
@ -1339,8 +1337,6 @@ Containers::StridedArrayView2D<const char> SceneData::field(const SceneField nam
} }
Containers::StridedArrayView2D<char> SceneData::mutableField(const SceneField name) { Containers::StridedArrayView2D<char> SceneData::mutableField(const SceneField name) {
CORRADE_ASSERT(_dataFlags & DataFlag::Mutable,
"Trade::SceneData::mutableField(): data not mutable", {});
const UnsignedInt fieldId = findFieldIdInternal(name); const UnsignedInt fieldId = findFieldIdInternal(name);
CORRADE_ASSERT(fieldId != ~UnsignedInt{}, CORRADE_ASSERT(fieldId != ~UnsignedInt{},
"Trade::SceneData::mutableField(): field" << name << "not found", {}); "Trade::SceneData::mutableField(): field" << name << "not found", {});

Loading…
Cancel
Save