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

Fix incorrect invariant check for iterators. We don't have a proper comparator for them, we need to wait until they are inserted in the sequence before checking invariants.

Browse Source
This commit is contained in:
Ion Gaztañaga
2024-09-08 01:51:16 +02:00
parent ceadad2e6e
commit 48acf451b8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@
#include <boost/move/iterator.hpp> #include <boost/move/iterator.hpp>
#include <boost/move/adl_move_swap.hpp> #include <boost/move/adl_move_swap.hpp>
#include <boost/move/detail/iterator_to_raw_pointer.hpp> #include <boost/move/detail/iterator_to_raw_pointer.hpp>
#include <boost/move/detail/to_raw_pointer.hpp>
#include <boost/move/detail/force_ptr.hpp> #include <boost/move/detail/force_ptr.hpp>
#include <boost/move/detail/launder.hpp> #include <boost/move/detail/launder.hpp>
#include <boost/move/algo/adaptive_sort.hpp> #include <boost/move/algo/adaptive_sort.hpp>
@@ -199,7 +200,8 @@ inline void flat_tree_merge_equal //has_merge_unique == false
{ {
if(first != last) { if(first != last) {
typedef typename SequenceContainer::iterator iterator; typedef typename SequenceContainer::iterator iterator;
iterator const it = dest.insert( dest.end(), first, last ); iterator const it = dest.insert( dest.end(), first, last);
BOOST_ASSERT((is_sorted)(it, dest.end(), comp));
dtl::bool_<is_contiguous_container<SequenceContainer>::value> contiguous_tag; dtl::bool_<is_contiguous_container<SequenceContainer>::value> contiguous_tag;
(flat_tree_container_inplace_merge)(dest, it, comp, contiguous_tag); (flat_tree_container_inplace_merge)(dest, it, comp, contiguous_tag);
} }
@@ -227,7 +229,9 @@ inline void flat_tree_merge_unique //has_merge_unique == false
typedef typename SequenceContainer::difference_type difference_type; typedef typename SequenceContainer::difference_type difference_type;
size_type const old_sz = dest.size(); size_type const old_sz = dest.size();
iterator const first_new = dest.insert(dest.cend(), first, last ); iterator const first_new = dest.insert(dest.cend(), first, last);
//We can't assert "is_sorted_and_unique" because the sequence can come from a multiset
BOOST_ASSERT((is_sorted)(first_new, dest.end(), comp));
iterator e = boost::movelib::inplace_set_unique_difference(first_new, dest.end(), dest.begin(), first_new, comp); iterator e = boost::movelib::inplace_set_unique_difference(first_new, dest.end(), dest.begin(), first_new, comp);
dest.erase(e, dest.end()); dest.erase(e, dest.end());
dtl::bool_<is_contiguous_container<SequenceContainer>::value> contiguous_tag; dtl::bool_<is_contiguous_container<SequenceContainer>::value> contiguous_tag;
@@ -954,7 +958,6 @@ class flat_tree
template <class InIt> template <class InIt>
void insert_equal(ordered_range_t, InIt first, InIt last) void insert_equal(ordered_range_t, InIt first, InIt last)
{ {
BOOST_ASSERT((is_sorted)(first, last, this->priv_value_comp()));
const bool value = boost::container::dtl:: const bool value = boost::container::dtl::
has_member_function_callable_with_merge_unique<container_type, InIt, InIt, value_compare>::value; has_member_function_callable_with_merge_unique<container_type, InIt, InIt, value_compare>::value;
(flat_tree_merge_equal)(this->m_data.m_seq, first, last, this->priv_value_comp(), dtl::bool_<value>()); (flat_tree_merge_equal)(this->m_data.m_seq, first, last, this->priv_value_comp(), dtl::bool_<value>());
@@ -963,7 +966,6 @@ class flat_tree
template <class InIt> template <class InIt>
void insert_unique(ordered_unique_range_t, InIt first, InIt last) void insert_unique(ordered_unique_range_t, InIt first, InIt last)
{ {
BOOST_ASSERT((is_sorted_and_unique)(this->m_data.m_seq.cbegin(), this->m_data.m_seq.cend(), this->priv_value_comp()));
const bool value = boost::container::dtl:: const bool value = boost::container::dtl::
has_member_function_callable_with_merge_unique<container_type, InIt, InIt, value_compare>::value; has_member_function_callable_with_merge_unique<container_type, InIt, InIt, value_compare>::value;
(flat_tree_merge_unique)(this->m_data.m_seq, first, last, this->priv_value_comp(), dtl::bool_<value>()); (flat_tree_merge_unique)(this->m_data.m_seq, first, last, this->priv_value_comp(), dtl::bool_<value>());