Merged to 7.0 in r340662.
On Thu, Aug 23, 2018 at 10:08 AM, Erik Pilkington via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: epilk > Date: Thu Aug 23 10:08:02 2018 > New Revision: 340544 > > URL: http://llvm.org/viewvc/llvm-project?rev=340544&view=rev > Log: > Comment out #define __cpp_lib_node_extract, we only support half of that > functionality > > Differential revision: https://reviews.llvm.org/D51172 > > Modified: > libcxx/trunk/include/__node_handle > > Modified: libcxx/trunk/include/__node_handle > URL: > http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__node_handle?rev=340544&r1=340543&r2=340544&view=diff > ============================================================================== > --- libcxx/trunk/include/__node_handle (original) > +++ libcxx/trunk/include/__node_handle Thu Aug 23 10:08:02 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> > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits