ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Trade: the comma in this assert feels weird.

pull/549/head
Vladimír Vondruš 4 years ago
parent
68d15bd8d0
commit
96f4dd077f
2 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/Magnum/Trade/SceneData.h
  2. 16
      src/Magnum/Trade/Test/SceneDataTest.cpp

8
src/Magnum/Trade/SceneData.h
Unescape View File

@ -3066,11 +3066,11 @@ constexpr SceneFieldData::SceneFieldData(const SceneField name, const SceneMappi
"Trade::SceneFieldData: can't pass Trade::SceneFieldFlag::OffsetOnly for a view"), flags)},
_mappingType{mappingType},
_mappingStride{(CORRADE_CONSTEXPR_ASSERT(mappingData.stride() >= -32768 && mappingData.stride() <= 32767,
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits, but got" << mappingData.stride()), Short(mappingData.stride()))},
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits but got" << mappingData.stride()), Short(mappingData.stride()))},
_mappingData{mappingData.data()},
_fieldType{fieldType},
_fieldStride{(CORRADE_CONSTEXPR_ASSERT(fieldData.stride() >= -32768 && fieldData.stride() <= 32767,
"Trade::SceneFieldData: expected field view stride to fit into 16 bits, but got" << fieldData.stride()), Short(fieldData.stride()))},
"Trade::SceneFieldData: expected field view stride to fit into 16 bits but got" << fieldData.stride()), Short(fieldData.stride()))},
_fieldArraySize{(CORRADE_CONSTEXPR_ASSERT(!fieldArraySize || Implementation::isSceneFieldArrayAllowed(name),
"Trade::SceneFieldData:" << name << "can't be an array field"), fieldArraySize)},
_fieldData{fieldData.data()} {}
@ -3095,11 +3095,11 @@ constexpr SceneFieldData::SceneFieldData(const SceneField name, const std::size_
_flags{flags|SceneFieldFlag::OffsetOnly},
_mappingType{mappingType},
_mappingStride{(CORRADE_CONSTEXPR_ASSERT(mappingStride >= -32768 && mappingStride <= 32767,
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits, but got" << mappingStride), Short(mappingStride))},
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits but got" << mappingStride), Short(mappingStride))},
_mappingData{mappingOffset},
_fieldType{fieldType},
_fieldStride{(CORRADE_CONSTEXPR_ASSERT(fieldStride >= -32768 && fieldStride <= 32767,
"Trade::SceneFieldData: expected field view stride to fit into 16 bits, but got" << fieldStride), Short(fieldStride))},
"Trade::SceneFieldData: expected field view stride to fit into 16 bits but got" << fieldStride), Short(fieldStride))},
_fieldArraySize{(CORRADE_CONSTEXPR_ASSERT(!fieldArraySize || Implementation::isSceneFieldArrayAllowed(name),
"Trade::SceneFieldData:" << name << "can't be an array field"), fieldArraySize)},
_fieldData{fieldOffset} {}

16
src/Magnum/Trade/Test/SceneDataTest.cpp
Unescape View File

@ -1053,10 +1053,10 @@ void SceneDataTest::constructFieldTooLargeMappingStride() {
SceneFieldData{SceneField::Mesh, 2, SceneMappingType::UnsignedInt, 0, 32768, SceneFieldType::UnsignedInt, 0, 4};
SceneFieldData{SceneField::Mesh, 2, SceneMappingType::UnsignedInt, 65538, -32769, SceneFieldType::UnsignedInt, 0, 4};
CORRADE_COMPARE(out.str(),
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits, but got 32768\n"
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits, but got -32769\n"
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits, but got 32768\n"
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits, but got -32769\n");
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits but got 32768\n"
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits but got -32769\n"
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits but got 32768\n"
"Trade::SceneFieldData: expected mapping view stride to fit into 16 bits but got -32769\n");
}
void SceneDataTest::constructFieldTooLargeFieldStride() {
@ -1080,10 +1080,10 @@ void SceneDataTest::constructFieldTooLargeFieldStride() {
SceneFieldData{SceneField::Mesh, 2, SceneMappingType::UnsignedInt, 0, 4, SceneFieldType::UnsignedInt, 0, 32768};
SceneFieldData{SceneField::Mesh, 2, SceneMappingType::UnsignedInt, 0, 4, SceneFieldType::UnsignedInt, 65538, -32769};
CORRADE_COMPARE(out.str(),
"Trade::SceneFieldData: expected field view stride to fit into 16 bits, but got 32768\n"
"Trade::SceneFieldData: expected field view stride to fit into 16 bits, but got -32769\n"
"Trade::SceneFieldData: expected field view stride to fit into 16 bits, but got 32768\n"
"Trade::SceneFieldData: expected field view stride to fit into 16 bits, but got -32769\n");
"Trade::SceneFieldData: expected field view stride to fit into 16 bits but got 32768\n"
"Trade::SceneFieldData: expected field view stride to fit into 16 bits but got -32769\n"
"Trade::SceneFieldData: expected field view stride to fit into 16 bits but got 32768\n"
"Trade::SceneFieldData: expected field view stride to fit into 16 bits but got -32769\n");
}
void SceneDataTest::constructFieldOffsetOnlyNotAllowed() {

Write Preview
Loading…
Cancel
Save