From dccbc0b23e655c3f62c7506127bd768cafa2e672 Mon Sep 17 00:00:00 2001 From: Simon Brand Date: Fri, 23 Feb 2018 09:34:05 +0000 Subject: [PATCH] C++11 fixes --- tests/constexpr.cpp | 2 +- tests/extensions.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/constexpr.cpp b/tests/constexpr.cpp index 9dabfd1..dc4db43 100644 --- a/tests/constexpr.cpp +++ b/tests/constexpr.cpp @@ -8,7 +8,7 @@ REQUIRE(e); TEST_CASE("Constexpr", "[constexpr]") { -#if !defined(TL_OPTIONAL_MSVC2015) && !defined(TL_OPTIONAL_GCC49) +#if !defined(TL_OPTIONAL_MSVC2015) && defined(TL_OPTIONAL_CXX14) SECTION("empty construct") { constexpr tl::optional o2{}; constexpr tl::optional o3 = {}; diff --git a/tests/extensions.cpp b/tests/extensions.cpp index 0f9827d..1524612 100644 --- a/tests/extensions.cpp +++ b/tests/extensions.cpp @@ -133,7 +133,7 @@ TEST_CASE("Monadic operations", "[monadic]") { } SECTION("map constexpr") { -#if !defined(_MSC_VER) && !defined(TL_OPTIONAL_GCC49) +#if !defined(_MSC_VER) && defined(TL_OPTIONAL_CXX14) // test each overload in turn constexpr tl::optional o16 = 42; constexpr auto o16r = o16.map(get_int); @@ -243,7 +243,7 @@ TEST_CASE("Monadic operations", "[monadic]") { } SECTION("constexpr and_then") { -#if !defined(_MSC_VER) && !defined(TL_OPTIONAL_GCC49) +#if !defined(_MSC_VER) && defined(TL_OPTIONAL_CXX14) constexpr tl::optional o10 = 42; constexpr auto o10r = o10.and_then(get_opt_int);