TartanLlama/optional
1
0
Fork 1
mirror of https://github.com/TartanLlama/optional.git synced 2025-08-04 20:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Simon Brand
2017-10-29 20:22:55 +00:00
parent 4e00a30e7b
commit 7cfe5f71e4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/extensions.cpp
View File

@@ -122,8 +122,7 @@ 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);
@@ -233,8 +232,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);
@@ -318,7 +317,7 @@ TEST_CASE("Monadic operations", "[monadic]") {
void non_const() {} void non_const() {}
}; };
#ifdef TL_OPTIONAL_CXX14 #if defined(TL_EXPECTED_CXX14) && !defined(TL_EXPECTED_GCC49) && !defined(TL_EXPECTED_GCC54)
SECTION("Issue #1") { SECTION("Issue #1") {
tl::optional<foo> f = foo{}; tl::optional<foo> f = foo{};
auto l = [](auto &&x) { x.non_const(); }; auto l = [](auto &&x) { x.non_const(); };