Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Self assignment #172

Merged
merged 8 commits into from
Sep 25, 2019
Merged

Self assignment #172

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4da4557
add self-assignment checks in copy and move assignment operator= (ref…
artemp Aug 13, 2019
ad85832
disable -Wself-assign-overloaded (-Werror) in self-assignment test
artemp Aug 13, 2019
7918a48
don't fail old compilers
artemp Aug 13, 2019
da2b171
Revert "don't fail old compilers"
artemp Aug 13, 2019
94fc937
Revert "disable -Wself-assign-overloaded (-Werror) in self-assignment…
artemp Aug 13, 2019
767bc18
Improve self-assignment/move checks to have one return path.
artemp Sep 25, 2019
b36c78e
Just use `assert(this!=&other)` in move assignment operator (https://…
artemp Sep 25, 2019
3dcac64
updated move assignment as suggested in https:/mapbox/var…
artemp Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions include/mapbox/variant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ class variant
#else
data_type data;
#endif

public:
VARIANT_INLINE variant() noexcept(std::is_nothrow_default_constructible<first_type>::value)
: type_index(sizeof...(Types)-1)
Expand Down Expand Up @@ -645,13 +645,18 @@ class variant
// move_assign uses move-construction via placement new.
noexcept(detail::conjunction<std::is_nothrow_move_constructible<Types>...>::value)
{
if (this == &other) { // playing safe in release mode, hit assertion in debug.
assert(false);
return *this;
}
move_assign(std::move(other));
return *this;
}

VARIANT_INLINE variant<Types...>& operator=(variant<Types...> const& other)
{
copy_assign(other);
if (this != &other)
copy_assign(other);
return *this;
}

Expand Down