diff options
| author | Erik Pilkington <erik.pilkington@gmail.com> | 2018-10-31 17:31:35 +0000 |
|---|---|---|
| committer | Erik Pilkington <erik.pilkington@gmail.com> | 2018-10-31 17:31:35 +0000 |
| commit | 5c4e07ae5c6f7f467b436f1b24f41ef4cf9897b3 (patch) | |
| tree | 69a408ee04a99d007a9471160c16bea24433d296 /libcxx/include/__node_handle | |
| parent | 3b39040ad44d921e1b273fe3bbfeeaa280d0cb8f (diff) | |
| download | bcm5719-llvm-5c4e07ae5c6f7f467b436f1b24f41ef4cf9897b3.tar.gz bcm5719-llvm-5c4e07ae5c6f7f467b436f1b24f41ef4cf9897b3.zip | |
Second half of C++17's splicing maps and sets
This commit adds a merge member function to all the map and set containers,
which splices nodes from the source container. This completes support for
P0083r3.
Differential revision: https://reviews.llvm.org/D48896
llvm-svn: 345744
Diffstat (limited to 'libcxx/include/__node_handle')
| -rw-r--r-- | libcxx/include/__node_handle | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libcxx/include/__node_handle b/libcxx/include/__node_handle index 567f8b047a3..a9cf3b7217a 100644 --- a/libcxx/include/__node_handle +++ b/libcxx/include/__node_handle @@ -26,9 +26,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD #if _LIBCPP_STD_VER > 14 -// FIXME: Uncomment this when we support the 'merge' functionality. -// #define __cpp_lib_node_extract 201606L - // Specialized in __tree & __hash_table for their _NodeType. template <class _NodeType, class _Alloc> struct __generic_container_node_destructor; |
