TartanLlama/optional
1
0
Fork 1
mirror of https://github.com/TartanLlama/optional.git synced 2025-07-30 09:57:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Constexpr fixes

Browse Source
This commit is contained in:
Simon Brand
2017-10-24 16:04:31 +01:00
parent 09249f3be0
commit 31da15a391
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/extensions.cpp
View File

@ -122,7 +122,8 @@ TEST_CASE("Monadic operations", "[monadic]") {
} }
SECTION("map constexpr") { 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 // test each overload in turn
constexpr tl::optional<int> o16 = 42; constexpr tl::optional<int> o16 = 42;
constexpr auto o16r = o16.map(get_int); constexpr auto o16r = o16.map(get_int);
@ -232,7 +233,8 @@ TEST_CASE("Monadic operations", "[monadic]") {
} }
SECTION("constexpr and_then") { 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<int> o10 = 42; constexpr tl::optional<int> o10 = 42;
constexpr auto o10r = o10.and_then(get_opt_int); constexpr auto o10r = o10.and_then(get_opt_int);
REQUIRE(*o10r == 42); REQUIRE(*o10r == 42);