TartanLlama/expected
1
0
Fork 1
mirror of https://github.com/TartanLlama/expected.git synced 2025-08-03 10:54:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Constexpr fixes

Browse Source
This commit is contained in:
Simon Brand
2017-12-19 15:23:56 +00:00
parent 24b4725966
commit d7c8a569ac
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tl/expected.hpp
View File

@@ -78,6 +78,12 @@
#define TL_EXPECTED_GCC49_CONSTEXPR constexpr #define TL_EXPECTED_GCC49_CONSTEXPR constexpr
#endif #endif
#ifdef TL_EXPECTED_MSVC2015_CONSTEXPR
#define TL_EXPECTED_MSVC2015_CONSTEXPR
#else
#define TL_EXPECTED_MSVC2015_CONSTEXPR constexpr
#endif
#if (__cplusplus == 201103L || defined(TL_EXPECTED_MSVC2015) || \ #if (__cplusplus == 201103L || defined(TL_EXPECTED_MSVC2015) || \
defined(TL_EXPECTED_GCC49)) && \ defined(TL_EXPECTED_GCC49)) && \
!defined(TL_EXPECTED_GCC54) !defined(TL_EXPECTED_GCC54)
@@ -1380,7 +1386,7 @@ public:
class U = T, class U = T,
detail::enable_if_t<!std::is_convertible<U &&, T>::value> * = nullptr, detail::enable_if_t<!std::is_convertible<U &&, T>::value> * = nullptr,
detail::expected_enable_forward_value<T, E, U> * = nullptr> detail::expected_enable_forward_value<T, E, U> * = nullptr>
explicit constexpr expected(U &&v) : expected(in_place, std::forward<U>(v)) {} explicit TL_EXPECTED_MSVC2015_CONSTEXPR expected(U &&v) : expected(in_place, std::forward<U>(v)) {}
/// \exclude /// \exclude
template < template <