From 31da15a3919665971d748254f41b8bf80b79f32c Mon Sep 17 00:00:00 2001 From: Simon Brand Date: Tue, 24 Oct 2017 16:04:31 +0100 Subject: [PATCH] Constexpr fixes --- tests/extensions.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/extensions.cpp b/tests/extensions.cpp index 0ccb5f3..d545fab 100644 --- a/tests/extensions.cpp +++ b/tests/extensions.cpp @@ -122,7 +122,8 @@ TEST_CASE("Monadic operations", "[monadic]") { } SECTION("map constexpr") { -#if !defined(_MSC_VER) && !defined(TL_OPTIONAL_GCC49) +#if !defined(_MSC_VER) && !defined(TL_OPTIONAL_GCC49) && \ + !defined(TL_OPTIONAL_GCC54) // test each overload in turn constexpr tl::optional o16 = 42; constexpr auto o16r = o16.map(get_int); @@ -232,7 +233,8 @@ TEST_CASE("Monadic operations", "[monadic]") { } SECTION("constexpr and_then") { -#if !defined(_MSC_VER) && !defined(TL_OPTIONAL_GCC49) +#if !defined(_MSC_VER) && !defined(TL_OPTIONAL_GCC49) && \ + !defined(TL_OPTIONAL_GCC54) constexpr tl::optional o10 = 42; constexpr auto o10r = o10.and_then(get_opt_int); REQUIRE(*o10r == 42);