hardcoresushi
/
libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Re-enable light_opt()&& and left_opt()&&

This commit is contained in:
Sebastian Messmer 2018-12-25 10:40:46 +01:00
parent b2bcfce95a
commit 8f9dcad559
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cpp-utils/either.h
View File

@ -119,7 +119,15 @@ namespace cpputils {
return boost::none;
}
}
// left_opt()&& not offered because optional<Left&&> doesn't work
// warning: opposed to the other left_opt variants, this one already moves the content and returns by value.
boost::optional<Left> left_opt() && noexcept(noexcept(boost::optional<Left>(std::move(_left)))) {
if (_side == Side::left) {
return std::move(_left);
} else {
return boost::none;
}
}
boost::optional<const Right&> right_opt() const& noexcept {
if (_side == Side::right) {
@ -135,7 +143,16 @@ namespace cpputils {
return boost::none;
}
}
// right_opt()&& not offered because optional<Right&&> doesn't work
// warning: opposed to the other left_opt variants, this one already moves the content and returns by value.
boost::optional<Right> right_opt() && noexcept(noexcept(boost::optional<Right>(std::move(_right)))) {
if (_side == Side::right) {
return std::move(_right);
} else {
return boost::none;
}
}
private:
union {