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

Constexpr fixes

Browse Source
This commit is contained in:
Simon Brand
2017-11-02 08:24:07 +00:00
parent 8ddc1d68fe
commit c14349bde1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
expected.hpp
View File

@@ -152,9 +152,9 @@ public:
/// \group unexpected_value /// \group unexpected_value
constexpr const E &value() const & { return m_val; } constexpr const E &value() const & { return m_val; }
/// \group unexpected_value /// \group unexpected_value
constexpr E &value() & { return m_val; } TL_EXPECTED_11_CONSTEXPR E &value() & { return m_val; }
/// \group unexpected_value /// \group unexpected_value
constexpr E &&value() && { return std::move(m_val); } TL_EXPECTED_11_CONSTEXPR E &&value() && { return std::move(m_val); }
/// \exclude /// \exclude
constexpr const E &&value() const && { return std::move(m_val); } constexpr const E &&value() const && { return std::move(m_val); }
@@ -521,14 +521,14 @@ struct expected_operations_base : expected_storage_base<T, E> {
bool has_value() const { return this->m_has_value; } bool has_value() const { return this->m_has_value; }
TL_EXPECTED_11_CONSTEXPR T &get() & { return this->m_val; } TL_EXPECTED_11_CONSTEXPR T &get() & { return this->m_val; }
TL_EXPECTED_11_CONSTEXPR const T &get() const & { return this->m_val; } constexpr const T &get() const & { return this->m_val; }
TL_EXPECTED_11_CONSTEXPR T &&get() && { std::move(this->m_val); } TL_EXPECTED_11_CONSTEXPR T &&get() && { std::move(this->m_val); }
#ifndef TL_EXPECTED_NO_CONSTRR #ifndef TL_EXPECTED_NO_CONSTRR
constexpr const T &&get() const && { return std::move(this->m_val); } constexpr const T &&get() const && { return std::move(this->m_val); }
#endif #endif
TL_EXPECTED_11_CONSTEXPR T &geterr() & { return this->m_unexpect; } TL_EXPECTED_11_CONSTEXPR T &geterr() & { return this->m_unexpect; }
TL_EXPECTED_11_CONSTEXPR const T &geterr() const & { constexpr const T &geterr() const & {
return this->m_unexpect; return this->m_unexpect;
} }
TL_EXPECTED_11_CONSTEXPR T &&geterr() && { std::move(this->m_unexpect); } TL_EXPECTED_11_CONSTEXPR T &&geterr() && { std::move(this->m_unexpect); }