summaryrefslogtreecommitdiff
path: root/include/__node_handle
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2018-08-29 17:51:01 +0000
committerDimitry Andric <dim@FreeBSD.org>2018-08-29 17:51:01 +0000
commite0095a7644863a8d37ebc2306549cb4e92ecd3aa (patch)
tree83f399c6616b05976fe3f93c22581f6f39e58b25 /include/__node_handle
parent8ad8b454b4916f3cbee9af77a1095ffbf2bc0896 (diff)
Vendor import of libc++ release_70 branch r340910:vendor/libc++/libc++-release_70-r340910
Notes
svn path=/vendor/libc++/dist-release_70/; revision=338384 svn path=/vendor/libc++/libc++-release_70-r340910/; revision=338385; tag=vendor/libc++/libc++-release_70-r340910
Diffstat (limited to 'include/__node_handle')
-rw-r--r--include/__node_handle3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/__node_handle b/include/__node_handle
index fe09f3c1e51c..567f8b047a34 100644
--- a/include/__node_handle
+++ b/include/__node_handle
@@ -26,7 +26,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 14
-#define __cpp_lib_node_extract 201606L
+// 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>