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

Constexpr fixes

Browse Source
This commit is contained in:
Simon Brand
2017-12-23 15:30:44 +00:00
parent 9ff078cc24
commit 6ec9ffded9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tl/expected.hpp
View File

@@ -25,6 +25,9 @@
#if (defined(_MSC_VER) && _MSC_VER == 1900) #if (defined(_MSC_VER) && _MSC_VER == 1900)
/// \exclude /// \exclude
#define TL_EXPECTED_MSVC2015 #define TL_EXPECTED_MSVC2015
#define TL_EXPECTED_MSVC2015_CONSTEXPR
#else
#define TL_EXPECTED_MSVC2015_CONSTEXPR constexpr
#endif #endif
#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && \ #if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && \
@@ -458,7 +461,7 @@ template <class T, class E> struct expected_storage_base<T, E, false, true> {
// `T` is `void`, `E` is trivially-destructible // `T` is `void`, `E` is trivially-destructible
template <class E> struct expected_storage_base<void, E, false, true> { template <class E> struct expected_storage_base<void, E, false, true> {
constexpr expected_storage_base() : m_has_val(true) {} TL_EXPECTED_MSVC2015_CONSTEXPR expected_storage_base() : m_has_val(true) {}
constexpr expected_storage_base(no_init_t) : m_has_val(false) {} constexpr expected_storage_base(no_init_t) : m_has_val(false) {}
constexpr expected_storage_base(in_place_t) : m_has_val(true) {} constexpr expected_storage_base(in_place_t) : m_has_val(true) {}