From 7ffe30c676bdce3aaa448ee2a4f978557074ab84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 12 Apr 2016 14:55:50 +0200 Subject: [PATCH] Oh, std::pair is not constexpr in C++11. That's why. This partially reverts commit 628201946b1cc633226c3623c8bf951baa989326. --- src/Magnum/Test/VersionTest.cpp | 6 ++---- src/Magnum/Version.h | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Magnum/Test/VersionTest.cpp b/src/Magnum/Test/VersionTest.cpp index 2fe3e4e82..d439b7b02 100644 --- a/src/Magnum/Test/VersionTest.cpp +++ b/src/Magnum/Test/VersionTest.cpp @@ -75,11 +75,9 @@ void VersionTest::fromNumber() { void VersionTest::toNumber() { #ifndef MAGNUM_TARGET_GLES - constexpr const auto v = version(Version::GL430); - CORRADE_COMPARE(v, std::make_pair(4, 3)); + CORRADE_COMPARE(version(Version::GL430), std::make_pair(4, 3)); #else - constexpr const auto v = version(Version::GLES300); - CORRADE_COMPARE(v, std::make_pair(3, 0)); + CORRADE_COMPARE(version(Version::GLES300), std::make_pair(3, 0)); #endif } diff --git a/src/Magnum/Version.h b/src/Magnum/Version.h index 936210a5c..3b2271f5f 100644 --- a/src/Magnum/Version.h +++ b/src/Magnum/Version.h @@ -118,9 +118,9 @@ constexpr Version version(Int major, Int minor) { @see @ref isVersionES() */ -constexpr std::pair version(Version version) { - return {(Int(version) & ~Implementation::VersionESMask)/100, - ((Int(version) & ~Implementation::VersionESMask)%100)/10}; +inline std::pair version(Version version) { + const Int v = Int(version) & ~Implementation::VersionESMask; + return {v/100, (v%100)/10}; } /**