[libcxx] r340662 - Merging r340544:

[Hans Wennborg via cfe-commits]

Author: hans
Date: Fri Aug 24 15:16:24 2018
New Revision: 340662

URL: http://llvm.org/viewvc/llvm-project?rev=340662&view=rev
Log:
Merging r340544:
------------------------------------------------------------------------
r340544 | epilk | 2018-08-23 19:08:02 +0200 (Thu, 23 Aug 2018) | 3 lines

Comment out #define __cpp_lib_node_extract, we only support half of that functionality

Differential revision: https://reviews.llvm.org/D51172
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_70/   (props changed)
    libcxx/branches/release_70/include/__node_handle

Propchange: libcxx/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 24 15:16:24 2018
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:339431,339675,339697,339702,339741-339743,339794,339804,339816,339874,340406
+/libcxx/trunk:339431,339675,339697,339702,339741-339743,339794,339804,339816,339874,340406,340544

Modified: libcxx/branches/release_70/include/__node_handle
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_70/include/__node_handle?rev=340662&r1=340661&r2=340662&view=diff
==============================================================================
--- libcxx/branches/release_70/include/__node_handle (original)
+++ libcxx/branches/release_70/include/__node_handle Fri Aug 24 15:16:24 2018
@@ -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>