boost_mirror/multi_index
1
0
Fork 0
mirror of https://github.com/boostorg/multi_index.git synced 2025-05-09 23:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

replaced multi_index_container::merge_ with transfer_range_

Browse Source 
so as to refactor some code in non-key-based indices
This commit is contained in:
joaquintides 2021-08-09 10:35:23 +02:00
parent cb6a581eda
commit a1e4d04fcc
6 changed files with 29 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/boost/multi_index/detail/index_base.hpp
View File

@ -332,7 +332,14 @@ protected:
void final_clear_(){final().clear_();}
template<typename Index>
void final_merge_(Index& x){return final().merge_(x);}
void final_transfer_range_(Index& x)
{final_transfer_range_(x,x.begin(),x.end());}
template<typename Index>
void final_transfer_range_(
Index& x,
BOOST_DEDUCED_TYPENAME Index::iterator first,
BOOST_DEDUCED_TYPENAME Index::iterator last)
{final().transfer_range_(x,first,last);}
void final_swap_(final_type& x){final().swap_(x);}

5
include/boost/multi_index/detail/ord_index_impl.hpp
View File

@ -542,8 +542,9 @@ public:
{
BOOST_MULTI_INDEX_CHECK_EQUAL_ALLOCATORS(*this,x);
BOOST_MULTI_INDEX_ORD_INDEX_CHECK_INVARIANT;
this->final_merge_(x);
if(x.end().get_node()!=this->header()){ /* different containers */
this->final_transfer_range_(x);
}
}
template<typename Index>

5
include/boost/multi_index/hashed_index.hpp
View File

@ -521,8 +521,9 @@ public:
{
BOOST_MULTI_INDEX_CHECK_EQUAL_ALLOCATORS(*this,x);
BOOST_MULTI_INDEX_HASHED_INDEX_CHECK_INVARIANT;
this->final_merge_(x);
if(x.end().get_node()!=this->header()){ /* different containers */
this->final_transfer_range_(x);
}
}
template<typename Index>

53
include/boost/multi_index/random_access_index.hpp
View File

@ -541,7 +541,9 @@ public:
BOOST_MULTI_INDEX_CHECK_DIFFERENT_CONTAINER(
this->final(*this),this->final(x));
BOOST_MULTI_INDEX_RND_INDEX_CHECK_INVARIANT;
external_splice(position,x,boost::is_copy_constructible<value_type>());
external_splice(
position,x,x.begin(),x.end(),
boost::is_copy_constructible<value_type>());
}
template<typename Index>
@ -1100,50 +1102,6 @@ private:
return std::pair<iterator,bool>(make_iterator(p.first),p.second);
}
template<typename Index>
void external_splice(
iterator position,Index& x,boost::true_type /* copy-constructible value */)
{
if(get_allocator()==x.get_allocator()){
external_splice(position,x,boost::false_type());
}
else{
/* backwards compatibility with old, non-transfer-based splice */
iterator first=x.begin(),last=x.end();
size_type n=size();
BOOST_TRY{
while(first!=last){
if(push_back(*first).second)first=x.erase(first);
else ++first;
}
}
BOOST_CATCH(...){
relocate(position,begin()+n,end());
BOOST_RETHROW;
}
BOOST_CATCH_END
relocate(position,begin()+n,end());
}
}
template<typename Index>
void external_splice(
iterator position,Index& x,
boost::false_type /* copy-constructible value */)
{
BOOST_MULTI_INDEX_CHECK_EQUAL_ALLOCATORS(*this,x);
size_type n=size();
BOOST_TRY{
this->final_merge_(x);
}
BOOST_CATCH(...){
relocate(position,begin()+n,end());
}
BOOST_CATCH_END
relocate(position,begin()+n,end());
}
template<typename Index>
void external_splice(
iterator position,Index& x,BOOST_DEDUCED_TYPENAME Index::iterator i,
@ -1241,10 +1199,7 @@ private:
BOOST_MULTI_INDEX_CHECK_EQUAL_ALLOCATORS(*this,x);
size_type n=size();
BOOST_TRY{
while(first!=last){
this->final_transfer_(
x,static_cast<final_node_type*>((first++).get_node()));
}
this->final_transfer_range_(x,first,last);
}
BOOST_CATCH(...){
relocate(position,begin()+n,end());

57
include/boost/multi_index/sequenced_index.hpp
View File

@ -492,7 +492,9 @@ public:
BOOST_MULTI_INDEX_CHECK_DIFFERENT_CONTAINER(
this->final(*this),this->final(x));
BOOST_MULTI_INDEX_SEQ_INDEX_CHECK_INVARIANT;
external_splice(position,x,boost::is_copy_constructible<value_type>());
external_splice(
position,x,x.begin(),x.end(),
boost::is_copy_constructible<value_type>());
}
template<typename Index>
@ -1013,49 +1015,6 @@ private:
return std::pair<iterator,bool>(make_iterator(p.first),p.second);
}
template<typename Index>
void external_splice(
iterator position,Index& x,boost::true_type /* copy-constructible value */)
{
if(get_allocator()==x.get_allocator()){
external_splice(position,x,boost::false_type());
}
else{
/* backwards compatibility with old, non-transfer-based splice */
iterator first=x.begin(),last=x.end();
while(first!=last){
if(insert(position,*first).second)first=x.erase(first);
else ++first;
}
}
}
template<typename Index>
void external_splice(
iterator position,Index& x,
boost::false_type /* copy-constructible value */)
{
BOOST_MULTI_INDEX_CHECK_EQUAL_ALLOCATORS(*this,x);
if(position==end()){
this->final_merge_(x);
}
else{
iterator first=end();
--first;
BOOST_TRY{
this->final_merge_(x);
}
BOOST_CATCH(...){
++first;
relink(position.get_node(),first.get_node(),header());
}
BOOST_CATCH_END
++first;
relink(position.get_node(),first.get_node(),header());
}
}
template<typename Index>
void external_splice(
iterator position,Index& x,BOOST_DEDUCED_TYPENAME Index::iterator i,
@ -1143,19 +1102,13 @@ private:
{
BOOST_MULTI_INDEX_CHECK_EQUAL_ALLOCATORS(*this,x);
if(position==end()){
while(first!=last){
this->final_transfer_(
x,static_cast<final_node_type*>((first++).get_node()));
}
this->final_transfer_range_(x,first,last);
}
else{
iterator first_to_relink=end();
--first_to_relink;
BOOST_TRY{
while(first!=last){
this->final_transfer_(
x,static_cast<final_node_type*>((first++).get_node()));
}
this->final_transfer_range_(x,first,last);
}
BOOST_CATCH(...){
++first_to_relink;

17
include/boost/multi_index_container.hpp
View File

@ -972,18 +972,13 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
}
template<typename Index>
void merge_(Index& x)
void transfer_range_(
Index& x,
BOOST_DEDUCED_TYPENAME Index::iterator first,
BOOST_DEDUCED_TYPENAME Index::iterator last)
{
typedef typename Index::iterator source_iterator;
source_iterator last=x.end();
if(last.get_node()!=this->header()){ /* different containers */
source_iterator first=x.begin();
while(first!=last){
transfer_(x,static_cast<final_node_type*>((first++).get_node()));
}
while(first!=last){
transfer_(x,static_cast<final_node_type*>((first++).get_node()));
}
}