feedc0de/optional
1
0
Fork 0
forked from TartanLlama/optional
Code Pull Requests Activity

Correct GCC5.5 macro

Browse Source
This commit is contained in:
Simon Brand
2018-06-07 09:05:39 +01:00
parent 6e8235c085
commit 04b817f0d3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/extensions.cpp
View File

@ -133,7 +133,7 @@ TEST_CASE("Monadic operations", "[monadic]") {
}
SECTION("map constexpr") {
#if !defined(_MSC_VER) && defined(TL_OPTIONAL_CXX14) && !defined(TL_OPTIONAL_GCC55)
#if !defined(_MSC_VER) && defined(TL_OPTIONAL_CXX14)
// test each overload in turn
constexpr tl::optional<int> o16 = 42;
constexpr auto o16r = o16.map(get_int);
@ -248,7 +248,7 @@ TEST_CASE("Monadic operations", "[monadic]") {
}
SECTION("constexpr and_then") {
#if !defined(_MSC_VER) && defined(TL_OPTIONAL_CXX14) && !defined(TL_OPTIONAL_GCC55)
#if !defined(_MSC_VER) && defined(TL_OPTIONAL_CXX14)
constexpr tl::optional<int> o10 = 42;
constexpr auto o10r = o10.and_then(get_opt_int);

2
tl/optional.hpp
View File

@ -38,7 +38,7 @@
#define TL_OPTIONAL_GCC54
#endif
#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 4 && \
#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 5 && \
!defined(__clang__))
#define TL_OPTIONAL_GCC55
#endif