From b3a848c0d682a918c05191329101f74463c4da87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 13 Aug 2020 08:20:23 +0200 Subject: [PATCH] Trade: sigh, MSVC 2015, again. --- src/Magnum/Trade/Test/MaterialDataTest.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Magnum/Trade/Test/MaterialDataTest.cpp b/src/Magnum/Trade/Test/MaterialDataTest.cpp index 6d9dad15c..966509107 100644 --- a/src/Magnum/Trade/Test/MaterialDataTest.cpp +++ b/src/Magnum/Trade/Test/MaterialDataTest.cpp @@ -613,7 +613,12 @@ template void MaterialDataTest::constructAttributeStringConstexpr() { setTestCaseTemplateName(TypeName::name()); /* "templateAttrib" is 14 chars, which is the maximum for 48-bit types */ - constexpr MaterialAttributeData attribute{"templateAttrib"_s, T(15)}; + #ifndef CORRADE_MSVC2015_COMPATIBILITY + /* Unfortunately this doesn't always work, for example Vector3. Disabling + unconditionally, might revisit later. */ + constexpr + #endif + MaterialAttributeData attribute{"templateAttrib"_s, T(15)}; CORRADE_COMPARE(attribute.name(), "templateAttrib"); CORRADE_COMPARE(attribute.name().flags(), Containers::StringViewFlag::NullTerminated); CORRADE_COMPARE(attribute.name()[attribute.name().size()], '\0');