feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Statically handle 'is_unique' in assignments

Browse Source
This commit is contained in:
Daniel James
2017-05-06 04:58:57 +01:00
parent 6e074d7165
commit b6c6bfbe7f
3 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/boost/unordered/unordered_set.hpp
View File

@@ -144,7 +144,7 @@ template <class T, class H, class P, class A> class unordered_set
#if defined(BOOST_UNORDERED_USE_MOVE)
unordered_set& operator=(BOOST_COPY_ASSIGN_REF(unordered_set) x)
{
table_.assign(x.table_, true);
table_.assign(x.table_, boost::unordered::detail::true_type());
return *this;
}
@@ -154,13 +154,13 @@ template <class T, class H, class P, class A> class unordered_set
// is_nothrow_move_assignable_v<H> &&
// is_nothrow_move_assignable_v<P>)
{
table_.move_assign(x.table_, true);
table_.move_assign(x.table_, boost::unordered::detail::true_type());
return *this;
}
#else
unordered_set& operator=(unordered_set const& x)
{
table_.assign(x.table_, true);
table_.assign(x.table_, boost::unordered::detail::true_type());
return *this;
}
@@ -171,7 +171,7 @@ template <class T, class H, class P, class A> class unordered_set
// is_nothrow_move_assignable_v<H> &&
// is_nothrow_move_assignable_v<P>)
{
table_.move_assign(x.table_, true);
table_.move_assign(x.table_, boost::unordered::detail::true_type());
return *this;
}
#endif
@@ -654,7 +654,7 @@ template <class T, class H, class P, class A> class unordered_multiset
#if defined(BOOST_UNORDERED_USE_MOVE)
unordered_multiset& operator=(BOOST_COPY_ASSIGN_REF(unordered_multiset) x)
{
table_.assign(x.table_, false);
table_.assign(x.table_, boost::unordered::detail::false_type());
return *this;
}
@@ -664,13 +664,13 @@ template <class T, class H, class P, class A> class unordered_multiset
// is_nothrow_move_assignable_v<H> &&
// is_nothrow_move_assignable_v<P>)
{
table_.move_assign(x.table_, false);
table_.move_assign(x.table_, boost::unordered::detail::false_type());
return *this;
}
#else
unordered_multiset& operator=(unordered_multiset const& x)
{
table_.assign(x.table_, false);
table_.assign(x.table_, boost::unordered::detail::false_type());
return *this;
}
@@ -681,7 +681,7 @@ template <class T, class H, class P, class A> class unordered_multiset
// is_nothrow_move_assignable_v<H> &&
// is_nothrow_move_assignable_v<P>)
{
table_.move_assign(x.table_, false);
table_.move_assign(x.table_, boost::unordered::detail::false_type());
return *this;
}
#endif
@@ -1078,7 +1078,8 @@ unordered_set<T, H, P, A>::unordered_set(unordered_set const& other)
select_on_container_copy_construction(other.get_allocator()))
{
if (other.table_.size_) {
table_.copy_buckets_unique(other.table_);
table_.copy_buckets(
other.table_, boost::unordered::detail::true_type());
}
}
@@ -1095,7 +1096,8 @@ unordered_set<T, H, P, A>::unordered_set(
: table_(other.table_, a)
{
if (other.table_.size_) {
table_.copy_buckets_unique(other.table_);
table_.copy_buckets(
other.table_, boost::unordered::detail::true_type());
}
}
@@ -1472,7 +1474,8 @@ unordered_multiset<T, H, P, A>::unordered_multiset(
select_on_container_copy_construction(other.get_allocator()))
{
if (other.table_.size_) {
table_.copy_buckets_equiv(other.table_);
table_.copy_buckets(
other.table_, boost::unordered::detail::false_type());
}
}
@@ -1489,7 +1492,8 @@ unordered_multiset<T, H, P, A>::unordered_multiset(
: table_(other.table_, a)
{
if (other.table_.size_) {
table_.copy_buckets_equiv(other.table_);
table_.copy_buckets(
other.table_, boost::unordered::detail::false_type());
}
}