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

As described in #139, fixed complexity of "merge", as a O(n) inplace merge is used and explicitly state all iterators are invalidated.

Browse Source
This commit is contained in:
Ion Gaztañaga
2020-11-14 23:31:30 +01:00
parent 93bbf37dad
commit f50195524f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/container/flat_map.hpp
View File

@@ -1215,7 +1215,9 @@ class flat_map
//! the comparison object of *this. If there is an element in a with key equivalent to the //! the comparison object of *this. If there is an element in a with key equivalent to the
//! key of an element from source, then that element is not moved from source. //! key of an element from source, then that element is not moved from source.
//! //!
//! <b>Complexity</b>: N log(size() + N) (N has the value source.size()) //! <b>Complexity</b>: Linear in this->size() + source.size().
//!
//! <b>Note</b>: Invalidates all iterators and references.
template<class C2> template<class C2>
BOOST_CONTAINER_FORCEINLINE void merge(flat_map<Key, T, C2, AllocatorOrContainer>& source) BOOST_CONTAINER_FORCEINLINE void merge(flat_map<Key, T, C2, AllocatorOrContainer>& source)
{ m_flat_tree.merge_unique(source.tree()); } { m_flat_tree.merge_unique(source.tree()); }
@@ -2576,7 +2578,9 @@ class flat_multimap
//! <b>Effects</b>: Move-inserts each element from source into *this a using //! <b>Effects</b>: Move-inserts each element from source into *this a using
//! the comparison object of *this. //! the comparison object of *this.
//! //!
//! <b>Complexity</b>: N log(size() + N) (N has the value source.size()) //! <b>Complexity</b>: Linear in this->size() + source.size().
//!
//! <b>Note</b>: Invalidates all iterators and references.
template<class C2> template<class C2>
BOOST_CONTAINER_FORCEINLINE void merge(flat_multimap<Key, T, C2, AllocatorOrContainer>& source) BOOST_CONTAINER_FORCEINLINE void merge(flat_multimap<Key, T, C2, AllocatorOrContainer>& source)
{ m_flat_tree.merge_equal(source.tree()); } { m_flat_tree.merge_equal(source.tree()); }