summaryrefslogtreecommitdiff
path: root/libcxx/include/algorithm
diff options
context:
space:
mode:
authorNikolas Klauser <nikolasklauser@berlin.de>2023-05-30 09:27:10 -0700
committerNikolas Klauser <nikolasklauser@berlin.de>2023-05-30 15:07:06 -0700
commitbf63b15bd4bf4ca0b0d56319af74eb259e0b6d3e (patch)
tree7cd39b72f3f0ecd0ca86790207b881fa96f3e2a3 /libcxx/include/algorithm
parent48e5f704c55f406e0bdbd989434c8b3777b27fe4 (diff)
[libc++][PSTL] Implement std::merge
Reviewed By: ldionne, #libc Spies: pcwang-thead, libcxx-commits Differential Revision: https://reviews.llvm.org/D151375
Diffstat (limited to 'libcxx/include/algorithm')
-rw-r--r--libcxx/include/algorithm1
1 files changed, 1 insertions, 0 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
index 190214021df7..0f52da9a17d8 100644
--- a/libcxx/include/algorithm
+++ b/libcxx/include/algorithm
@@ -1805,6 +1805,7 @@ template <class BidirectionalIterator, class Compare>
#include <__algorithm/pstl_fill.h>
#include <__algorithm/pstl_find.h>
#include <__algorithm/pstl_for_each.h>
+#include <__algorithm/pstl_merge.h>
#include <__algorithm/pstl_transform.h>
#include <__algorithm/push_heap.h>
#include <__algorithm/ranges_adjacent_find.h>