Browse Source

Trade: hi, MSVC 2015, you ancient curse.

pull/525/head
Vladimír Vondruš 5 years ago
parent
commit
73b32def51
  1. 2
      src/Magnum/Trade/Test/SceneDataTest.cpp

2
src/Magnum/Trade/Test/SceneDataTest.cpp

@ -448,6 +448,7 @@ void SceneDataTest::constructField() {
CORRADE_COMPARE(rotations.objectData(someArray).stride(), sizeof(UnsignedShort)); CORRADE_COMPARE(rotations.objectData(someArray).stride(), sizeof(UnsignedShort));
CORRADE_VERIFY(rotations.objectData(someArray).data() == rotationObjectData); CORRADE_VERIFY(rotations.objectData(someArray).data() == rotationObjectData);
#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Won't bother anymore */
constexpr SceneFieldData crotations{SceneField::Rotation, Containers::arrayView(RotationObjects2D), Containers::arrayView(Rotations2D)}; constexpr SceneFieldData crotations{SceneField::Rotation, Containers::arrayView(RotationObjects2D), Containers::arrayView(Rotations2D)};
constexpr bool isOffsetOnly = crotations.isOffsetOnly(); constexpr bool isOffsetOnly = crotations.isOffsetOnly();
constexpr SceneField name = crotations.name(); constexpr SceneField name = crotations.name();
@ -467,6 +468,7 @@ void SceneDataTest::constructField() {
CORRADE_COMPARE(fieldData.size(), 3); CORRADE_COMPARE(fieldData.size(), 3);
CORRADE_COMPARE(fieldData.stride(), sizeof(Complexd)); CORRADE_COMPARE(fieldData.stride(), sizeof(Complexd));
CORRADE_COMPARE(fieldData.data(), Rotations2D); CORRADE_COMPARE(fieldData.data(), Rotations2D);
#endif
} }
void SceneDataTest::constructFieldDefault() { void SceneDataTest::constructFieldDefault() {

Loading…
Cancel
Save