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

Fix #8

Browse Source
This commit is contained in:
Simon Brand
2018-04-11 15:53:01 +01:00
parent 74a422b824
commit d8973a6524
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tl/optional.hpp
View File

@ -1357,7 +1357,7 @@ public:
#ifndef TL_OPTIONAL_NO_CONSTRR #ifndef TL_OPTIONAL_NO_CONSTRR
/// \exclude /// \exclude
constexpr const T &&value() const && { TL_OPTIONAL_11_CONSTEXPR const T &&value() const && {
if (has_value()) if (has_value())
return std::move(this->m_value); return std::move(this->m_value);
throw bad_optional_access(); throw bad_optional_access();
@ -1374,7 +1374,7 @@ public:
} }
/// \group value_or /// \group value_or
template <class U> constexpr T value_or(U &&u) && { template <class U> TL_OPTIONAL_11_CONSTEXPR T value_or(U &&u) && {
static_assert(std::is_move_constructible<T>::value && static_assert(std::is_move_constructible<T>::value &&
std::is_convertible<U &&, T>::value, std::is_convertible<U &&, T>::value,
"T must be move constructible and convertible from U"); "T must be move constructible and convertible from U");
@ -2255,7 +2255,7 @@ public:
} }
/// \group value_or /// \group value_or
template <class U> constexpr T value_or(U &&u) && { template <class U> TL_OPTIONAL_11_CONSTEXPR T value_or(U &&u) && {
static_assert(std::is_move_constructible<T>::value && static_assert(std::is_move_constructible<T>::value &&
std::is_convertible<U &&, T>::value, std::is_convertible<U &&, T>::value,
"T must be move constructible and convertible from U"); "T must be move constructible and convertible from U");