More GCC 5.5 fixes

2018-06-06 11:24:10 +01:00
parent b72cc392b6
commit e0a542f960
1 changed files with 2 additions and 1 deletions
--- a/tl/optional.hpp
+++ b/tl/optional.hpp
@ -1604,7 +1604,8 @@ template <class T> optional(T)->optional<T>;

 /// \exclude
 namespace detail {
-#ifdef TL_OPTIONAL_CXX14
+#if defined(TL_OPTIONAL_CXX14) && !defined(TL_OPTIONAL_GCC49) &&               \
+    !defined(TL_OPTIONAL_GCC54) && !defined(TL_OPTIONAL_GCC55)
 template <class Opt, class F,
          class Ret = decltype(detail::invoke(std::declval<F>(),
                                              *std::declval<Opt>())),