aboutsummaryrefslogtreecommitdiff
path: root/libcxx/include/algorithm
diff options
context:
space:
mode:
authorHui Xie <hui.xie1990@gmail.com>2022-06-26 16:13:43 +0100
committerHui Xie <hui.xie1990@gmail.com>2022-07-04 13:44:31 +0100
commit25607d143d1d98ac1b16ebeb6af4f3cceea0d738 (patch)
tree59599429f6ffd93748857a22df17aaf0275dfcef /libcxx/include/algorithm
parent19a1e20b8a0f69da2a871eae6cbd03d1314ee02d (diff)
downloadllvm-25607d143d1d98ac1b16ebeb6af4f3cceea0d738.zip
llvm-25607d143d1d98ac1b16ebeb6af4f3cceea0d738.tar.gz
llvm-25607d143d1d98ac1b16ebeb6af4f3cceea0d738.tar.bz2
[libc++] Implement `std::ranges::merge`
Implement `std::ranges::merge`. added unit tests Differential Revision: https://reviews.llvm.org/D128611
Diffstat (limited to 'libcxx/include/algorithm')
-rw-r--r--libcxx/include/algorithm18
1 files changed, 18 insertions, 0 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
index 0154dbc..76bdf3b 100644
--- a/libcxx/include/algorithm
+++ b/libcxx/include/algorithm
@@ -493,6 +493,23 @@ namespace ranges {
constexpr ranges::move_result<borrowed_iterator_t<R>, O>
ranges::move(R&& r, O result); // since C++20
+ template<class I1, class I2, class O>
+ using merge_result = in_in_out_result<I1, I2, O>; // since C++20
+
+ template<input_iterator I1, sentinel_for<I1> S1, input_iterator I2, sentinel_for<I2> S2,
+ weakly_incrementable O, class Comp = ranges::less, class Proj1 = identity,
+ class Proj2 = identity>
+ requires mergeable<I1, I2, O, Comp, Proj1, Proj2>
+ constexpr merge_result<I1, I2, O>
+ merge(I1 first1, S1 last1, I2 first2, S2 last2, O result,
+ Comp comp = {}, Proj1 proj1 = {}, Proj2 proj2 = {}); // since C++20
+
+ template<input_range R1, input_range R2, weakly_incrementable O, class Comp = ranges::less,
+ class Proj1 = identity, class Proj2 = identity>
+ requires mergeable<iterator_t<R1>, iterator_t<R2>, O, Comp, Proj1, Proj2>
+ constexpr merge_result<borrowed_iterator_t<R1>, borrowed_iterator_t<R2>, O>
+ merge(R1&& r1, R2&& r2, O result,
+ Comp comp = {}, Proj1 proj1 = {}, Proj2 proj2 = {}); // since C++20
}
@@ -1249,6 +1266,7 @@ template <class BidirectionalIterator, class Compare>
#include <__algorithm/ranges_lower_bound.h>
#include <__algorithm/ranges_max.h>
#include <__algorithm/ranges_max_element.h>
+#include <__algorithm/ranges_merge.h>
#include <__algorithm/ranges_min.h>
#include <__algorithm/ranges_min_element.h>
#include <__algorithm/ranges_minmax.h>