boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-02 22:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Breakthrough-patch-1' into develop

Browse Source
This commit is contained in:
Ion Gaztañaga
2019-01-30 21:04:59 +01:00
parent 83bb62fed3 38b854b296
commit eaad660682
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/container/detail/flat_tree.hpp
View File

@@ -1215,15 +1215,15 @@ class flat_tree
template<class C2> template<class C2>
BOOST_CONTAINER_FORCEINLINE void merge_unique(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source) BOOST_CONTAINER_FORCEINLINE void merge_unique(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source)
{ {
this->insert( boost::make_move_iterator(source.begin()) this->insert_unique( boost::make_move_iterator(source.begin())
, boost::make_move_iterator(source.end())); , boost::make_move_iterator(source.end()));
} }
template<class C2> template<class C2>
BOOST_CONTAINER_FORCEINLINE void merge_equal(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source) BOOST_CONTAINER_FORCEINLINE void merge_equal(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source)
{ {
this->insert( boost::make_move_iterator(source.begin()) this->insert_equal( boost::make_move_iterator(source.begin())
, boost::make_move_iterator(source.end())); , boost::make_move_iterator(source.end()));
} }
BOOST_CONTAINER_FORCEINLINE void merge_unique(flat_tree& source) BOOST_CONTAINER_FORCEINLINE void merge_unique(flat_tree& source)