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

Merge branch 'feature/library_intermediate' into feature/library_intermediate2

This commit is contained in:
Sebastian Messmer 2018-12-30 00:00:09 +01:00
parent ce612145d1 0d54e2cd92
commit 822e9585fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ namespace cpputils {
// 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(std::declval<either<Left, Right>>()._left)))) {
if (_side == Side::left) {
return std::move(_left);
return std::move(_left); // NOLINT(cppcoreguidelines-pro-type-union-access)
} else {
return boost::none;
}
@ -146,7 +146,7 @@ namespace cpputils {
// 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(std::declval<either<Left, Right>>()._right)))) {
if (_side == Side::right) {
return std::move(_right);
return std::move(_right); // NOLINT(cppcoreguidelines-pro-type-union-access)
} else {
return boost::none;
}