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

fix

Browse Source
This commit is contained in:
Sebastian Messmer 2018-12-28 09:47:22 +01:00
parent a1e2fc4967
commit 6663ffd036
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ namespace cpputils {
} }
} }
either(either<Left, Right> &&rhs) noexcept(noexcept(_construct_left(std::move(rhs._left))) && noexcept(_construct_right(std::move(rhs._right)))) either(either<Left, Right> &&rhs) noexcept(noexcept(std::declval<either<Left, Right>>()._construct_left(std::move(rhs._left))) && noexcept(std::declval<either<Left, Right>>()._construct_right(std::move(rhs._right))))
: _side(rhs._side) { : _side(rhs._side) {
if(_side == Side::left) { if(_side == Side::left) {
_construct_left(std::move(rhs._left)); // NOLINT(cppcoreguidelines-pro-type-union-access) _construct_left(std::move(rhs._left)); // NOLINT(cppcoreguidelines-pro-type-union-access)
@ -47,7 +47,7 @@ namespace cpputils {
} }
//TODO Try allowing copy-assignment when Left/Right types are std::is_convertible //TODO Try allowing copy-assignment when Left/Right types are std::is_convertible
either<Left, Right> &operator=(const either<Left, Right> &rhs) noexcept(noexcept(_construct_left(rhs._left)) && noexcept(_construct_right(rhs._right))) { either<Left, Right> &operator=(const either<Left, Right> &rhs) noexcept(noexcept(std::declval<either<Left, Right>>()._construct_left(rhs._left)) && noexcept(std::declval<either<Left, Right>>()._construct_right(rhs._right))) {
_destruct(); _destruct();
_side = rhs._side; _side = rhs._side;
if (_side == Side::left) { if (_side == Side::left) {
@ -58,7 +58,7 @@ namespace cpputils {
return *this; return *this;
} }
either<Left, Right> &operator=(either<Left, Right> &&rhs) noexcept(noexcept(_construct_left(std::move(rhs._left))) && noexcept(_construct_right(std::move(rhs._right)))) { either<Left, Right> &operator=(either<Left, Right> &&rhs) noexcept(noexcept(std::declval<either<Left, Right>>()._construct_left(std::move(rhs._left))) && noexcept(std::declval<either<Left, Right>>()._construct_right(std::move(rhs._right)))) {
_destruct(); _destruct();
_side = rhs._side; _side = rhs._side;
if (_side == Side::left) { if (_side == Side::left) {