TartanLlama/optional
1
0
Fork 1
mirror of https://github.com/TartanLlama/optional.git synced 2025-07-29 17:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make take always move

Browse Source 
Fixes #23
This commit is contained in:
Simon Brand
2019-05-01 09:40:40 +01:00
parent c3752db7e8
commit 53697d4a36
1 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tl/optional.hpp
View File

@ -1032,32 +1032,12 @@ public:
#endif #endif
/// Takes the value out of the optional, leaving it empty /// Takes the value out of the optional, leaving it empty
optional take() & { optional take() {
optional ret = *this;
reset();
return ret;
}
optional take() const & {
optional ret = *this;
reset();
return ret;
}
optional take() && {
optional ret = std::move(*this); optional ret = std::move(*this);
reset(); reset();
return ret; return ret;
} }
#ifndef TL_OPTIONAL_NO_CONSTRR
optional take() const && {
optional ret = std::move(*this);
reset();
return ret;
}
#endif
using value_type = T; using value_type = T;
/// Constructs an optional that does not contain a value. /// Constructs an optional that does not contain a value.
@ -1926,32 +1906,12 @@ public:
#endif #endif
/// Takes the value out of the optional, leaving it empty /// Takes the value out of the optional, leaving it empty
optional take() & { optional take() {
optional ret = *this;
reset();
return ret;
}
optional take() const & {
optional ret = *this;
reset();
return ret;
}
optional take() && {
optional ret = std::move(*this); optional ret = std::move(*this);
reset(); reset();
return ret; return ret;
} }
#ifndef TL_OPTIONAL_NO_CONSTRR
optional take() const && {
optional ret = std::move(*this);
reset();
return ret;
}
#endif
using value_type = T &; using value_type = T &;
/// Constructs an optional that does not contain a value. /// Constructs an optional that does not contain a value.