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

Comparisons for unexpected, typo fixes

Browse Source
This commit is contained in:
Simon Brand
2017-10-26 22:01:26 +01:00
parent 013567d050
commit afa1b9ddc9
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
expected.hpp
View File

@@ -63,6 +63,26 @@ using enable_if_t = typename std::enable_if<E, T>::type;
operator!=(const unexpected<E>& lhs, const unexpected<E>& rhs) { operator!=(const unexpected<E>& lhs, const unexpected<E>& rhs) {
return lhs.value() != rhs.value(); return lhs.value() != rhs.value();
} }
template <class E>
constexpr bool
operator<(const unexpected<E>& lhs, const unexpected<E>& rhs) {
return lhs.value() < rhs.value();
}
template <class E>
constexpr bool
operator<=(const unexpected<E>& lhs, const unexpected<E>& rhs) {
return lhs.value() <= rhs.value();
}
template <class E>
constexpr bool
operator>(const unexpected<E>& lhs, const unexpected<E>& rhs) {
return lhs.value() > rhs.value();
}
template <class E>
constexpr bool
operator>=(const unexpected<E>& lhs, const unexpected<E>& rhs) {
return lhs.value() >= rhs.value();
}
struct unexpect_t { struct unexpect_t {
unexpect_t() = default; unexpect_t() = default;
@@ -292,11 +312,11 @@ class expected : private detail::expected_storage_base<T,E>, private detail::exp
static_assert(!std::is_reference<E>::value, "E must not be a reference"); static_assert(!std::is_reference<E>::value, "E must not be a reference");
static_assert(!std::is_same<T, void>::value, "T must not be void"); static_assert(!std::is_same<T, void>::value, "T must not be void");
T* valptr() { return std::addressof(this->m_value); } T* valptr() { return std::addressof(this->m_val); }
unexpected<E>* errptr() { return std::addressof(this->m_unexpect); } unexpected<E>* errptr() { return std::addressof(this->m_unexpect); }
T& val() { return this->m_value; } T& val() { return this->m_val; }
unexpected<E>& err() { return this->m_unexpect; } unexpected<E>& err() { return this->m_unexpect; }
const T& val() const { return this->m_value; } const T& val() const { return this->m_val; }
const unexpected<E>& err() const { return this->m_unexpect; } const unexpected<E>& err() const { return this->m_unexpect; }
using storage_base = detail::expected_storage_base<T,E>; using storage_base = detail::expected_storage_base<T,E>;