BlackMATov/flat.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/flat.hpp.git synced 2026-02-04 15:07:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix range merging order bug

Browse Source
This commit is contained in:
Matvey Cherevko
2019-05-31 10:18:38 +07:00
parent f34f7581ef
commit 16e6a2d082
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headers/flat.hpp/flat_map.hpp
View File

@@ -633,7 +633,7 @@ namespace flat_hpp
void insert_range_(Iter first, Iter last) { void insert_range_(Iter first, Iter last) {
const auto mid_iter = data_.insert(data_.end(), first, last); const auto mid_iter = data_.insert(data_.end(), first, last);
std::sort(mid_iter, data_.end(), value_comp()); std::sort(mid_iter, data_.end(), value_comp());
std::inplace_merge(data_.begin(), mid_iter, data_.end()); std::inplace_merge(data_.begin(), mid_iter, data_.end(), value_comp());
data_.erase( data_.erase(
std::unique(data_.begin(), data_.end(), std::unique(data_.begin(), data_.end(),
detail::eq_compare<value_compare>(value_comp())), detail::eq_compare<value_compare>(value_comp())),
@@ -644,7 +644,7 @@ namespace flat_hpp
void insert_range_(sorted_range_t, Iter first, Iter last) { void insert_range_(sorted_range_t, Iter first, Iter last) {
assert(detail::is_sorted(first, last, value_comp())); assert(detail::is_sorted(first, last, value_comp()));
const auto mid_iter = data_.insert(data_.end(), first, last); const auto mid_iter = data_.insert(data_.end(), first, last);
std::inplace_merge(data_.begin(), mid_iter, data_.end()); std::inplace_merge(data_.begin(), mid_iter, data_.end(), value_comp());
data_.erase( data_.erase(
std::unique(data_.begin(), data_.end(), std::unique(data_.begin(), data_.end(),
detail::eq_compare<value_compare>(value_comp())), detail::eq_compare<value_compare>(value_comp())),

4
headers/flat.hpp/flat_multimap.hpp
View File

@@ -568,14 +568,14 @@ namespace flat_hpp
void insert_range_(Iter first, Iter last) { void insert_range_(Iter first, Iter last) {
const auto mid_iter = data_.insert(data_.end(), first, last); const auto mid_iter = data_.insert(data_.end(), first, last);
std::sort(mid_iter, data_.end(), value_comp()); std::sort(mid_iter, data_.end(), value_comp());
std::inplace_merge(data_.begin(), mid_iter, data_.end()); std::inplace_merge(data_.begin(), mid_iter, data_.end(), value_comp());
} }
template < typename Iter > template < typename Iter >
void insert_range_(sorted_range_t, Iter first, Iter last) { void insert_range_(sorted_range_t, Iter first, Iter last) {
assert(detail::is_sorted(first, last, value_comp())); assert(detail::is_sorted(first, last, value_comp()));
const auto mid_iter = data_.insert(data_.end(), first, last); const auto mid_iter = data_.insert(data_.end(), first, last);
std::inplace_merge(data_.begin(), mid_iter, data_.end()); std::inplace_merge(data_.begin(), mid_iter, data_.end(), value_comp());
} }
private: private:
container_type data_; container_type data_;

4
headers/flat.hpp/flat_multiset.hpp
View File

@@ -484,14 +484,14 @@ namespace flat_hpp
void insert_range_(Iter first, Iter last) { void insert_range_(Iter first, Iter last) {
const auto mid_iter = data_.insert(data_.end(), first, last); const auto mid_iter = data_.insert(data_.end(), first, last);
std::sort(mid_iter, data_.end(), key_comp()); std::sort(mid_iter, data_.end(), key_comp());
std::inplace_merge(data_.begin(), mid_iter, data_.end()); std::inplace_merge(data_.begin(), mid_iter, data_.end(), key_comp());
} }
template < typename Iter > template < typename Iter >
void insert_range_(sorted_range_t, Iter first, Iter last) { void insert_range_(sorted_range_t, Iter first, Iter last) {
assert(detail::is_sorted(first, last, key_comp())); assert(detail::is_sorted(first, last, key_comp()));
const auto mid_iter = data_.insert(data_.end(), first, last); const auto mid_iter = data_.insert(data_.end(), first, last);
std::inplace_merge(data_.begin(), mid_iter, data_.end()); std::inplace_merge(data_.begin(), mid_iter, data_.end(), key_comp());
} }
private: private:
container_type data_; container_type data_;

4
headers/flat.hpp/flat_set.hpp
View File

@@ -549,7 +549,7 @@ namespace flat_hpp
void insert_range_(Iter first, Iter last) { void insert_range_(Iter first, Iter last) {
const auto mid_iter = data_.insert(data_.end(), first, last); const auto mid_iter = data_.insert(data_.end(), first, last);
std::sort(mid_iter, data_.end(), key_comp()); std::sort(mid_iter, data_.end(), key_comp());
std::inplace_merge(data_.begin(), mid_iter, data_.end()); std::inplace_merge(data_.begin(), mid_iter, data_.end(), key_comp());
data_.erase( data_.erase(
std::unique(data_.begin(), data_.end(), std::unique(data_.begin(), data_.end(),
detail::eq_compare<key_compare>(key_comp())), detail::eq_compare<key_compare>(key_comp())),
@@ -560,7 +560,7 @@ namespace flat_hpp
void insert_range_(sorted_range_t, Iter first, Iter last) { void insert_range_(sorted_range_t, Iter first, Iter last) {
assert(detail::is_sorted(first, last, key_comp())); assert(detail::is_sorted(first, last, key_comp()));
const auto mid_iter = data_.insert(data_.end(), first, last); const auto mid_iter = data_.insert(data_.end(), first, last);
std::inplace_merge(data_.begin(), mid_iter, data_.end()); std::inplace_merge(data_.begin(), mid_iter, data_.end(), key_comp());
data_.erase( data_.erase(
std::unique(data_.begin(), data_.end(), std::unique(data_.begin(), data_.end(),
detail::eq_compare<key_compare>(key_comp())), detail::eq_compare<key_compare>(key_comp())),