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

Move constructor implementation into containers

Browse Source
This commit is contained in:
Daniel James
2017-04-24 09:46:05 +01:00
parent 77bf2b5e33
commit 84f1ef6d2d
3 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/unordered/unordered_map.hpp
+26
View File
@@ -101,6 +101,7 @@ template <class K, class T, class H, class P, class A> class unordered_map
BOOST_NOEXCEPT_IF(table::nothrow_move_constructible)
: table_(other.table_, boost::unordered::detail::move_tag())
{
// The move is done in table_
}
#endif
@@ -883,6 +884,7 @@ template <class K, class T, class H, class P, class A> class unordered_multimap
BOOST_NOEXCEPT_IF(table::nothrow_move_constructible)
: table_(other.table_, boost::unordered::detail::move_tag())
{
// The move is done in table_
}
#endif
@@ -1378,6 +1380,9 @@ template <class K, class T, class H, class P, class A>
unordered_map<K, T, H, P, A>::unordered_map(unordered_map const& other)
: table_(other.table_)
{
if (other.table_.size_) {
table_.copy_buckets(other.table_);
}
}
template <class K, class T, class H, class P, class A>
@@ -1392,6 +1397,9 @@ unordered_map<K, T, H, P, A>::unordered_map(
unordered_map const& other, allocator_type const& a)
: table_(other.table_, a)
{
if (other.table_.size_) {
table_.copy_buckets(other.table_);
}
}
template <class K, class T, class H, class P, class A>
@@ -1399,6 +1407,12 @@ unordered_map<K, T, H, P, A>::unordered_map(
BOOST_RV_REF(unordered_map) other, allocator_type const& a)
: table_(other.table_, a, boost::unordered::detail::move_tag())
{
if (table_.node_alloc() == other.table_.node_alloc()) {
table_.move_buckets_from(other.table_);
} else if (other.table_.size_) {
// TODO: Could pick new bucket size?
table_.move_buckets(other.table_);
}
}
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -1854,6 +1868,9 @@ unordered_multimap<K, T, H, P, A>::unordered_multimap(
unordered_multimap const& other)
: table_(other.table_)
{
if (other.table_.size_) {
table_.copy_buckets(other.table_);
}
}
template <class K, class T, class H, class P, class A>
@@ -1868,6 +1885,9 @@ unordered_multimap<K, T, H, P, A>::unordered_multimap(
unordered_multimap const& other, allocator_type const& a)
: table_(other.table_, a)
{
if (other.table_.size_) {
table_.copy_buckets(other.table_);
}
}
template <class K, class T, class H, class P, class A>
@@ -1875,6 +1895,12 @@ unordered_multimap<K, T, H, P, A>::unordered_multimap(
BOOST_RV_REF(unordered_multimap) other, allocator_type const& a)
: table_(other.table_, a, boost::unordered::detail::move_tag())
{
if (table_.node_alloc() == other.table_.node_alloc()) {
table_.move_buckets_from(other.table_);
} else if (other.table_.size()) {
// TODO: Could pick new bucket size?
table_.move_buckets_equiv(other.table_);
}
}
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)