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

Typos

Browse Source
This commit is contained in:
Simon Brand
2017-11-02 08:25:00 +00:00
parent c14349bde1
commit 2a33820242
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
expected.hpp
View File

@@ -396,18 +396,18 @@ struct expected_operations_base : expected_storage_base<T, E> {
void hard_reset() noexcept { void hard_reset() noexcept {
get().~T(); get().~T();
this->m_has_value = false; this->m_has_val = false;
} }
template <class... Args> void construct(Args &&... args) noexcept { template <class... Args> void construct(Args &&... args) noexcept {
new (std::addressof(this->m_val)) T(std::forward<Args>(args)...); new (std::addressof(this->m_val)) T(std::forward<Args>(args)...);
this->m_has_value = true; this->m_has_val = true;
} }
template <class... Args> void construct_error(Args &&... args) noexcept { template <class... Args> void construct_error(Args &&... args) noexcept {
new (std::addressof(this->m_unexpect)) new (std::addressof(this->m_unexpect))
unexpected<E>(std::forward<Args>(args)...); unexpected<E>(std::forward<Args>(args)...);
this->m_has_value = false; this->m_has_val = false;
} }
// These assign overloads ensure that the most efficient assignment // These assign overloads ensure that the most efficient assignment
@@ -518,7 +518,7 @@ 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_val; }
TL_EXPECTED_11_CONSTEXPR T &get() & { return this->m_val; } TL_EXPECTED_11_CONSTEXPR T &get() & { return this->m_val; }
constexpr const T &get() const & { return this->m_val; } constexpr const T &get() const & { return this->m_val; }
@@ -528,9 +528,7 @@ struct expected_operations_base : expected_storage_base<T, E> {
#endif #endif
TL_EXPECTED_11_CONSTEXPR T &geterr() & { return this->m_unexpect; } TL_EXPECTED_11_CONSTEXPR T &geterr() & { return this->m_unexpect; }
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); }
#ifndef TL_EXPECTED_NO_CONSTRR #ifndef TL_EXPECTED_NO_CONSTRR
constexpr const T &&geterr() const && { return std::move(this->m_unexpect); } constexpr const T &&geterr() const && { return std::move(this->m_unexpect); }