This is an archive of the discontinued LLVM Phabricator instance.

[libcxx] Comment out #define __cpp_lib_node_extract, we only support half of that functionality
ClosedPublic

Authored by erik.pilkington on Aug 23 2018, 9:59 AM.

Download Raw Diff

Details

Reviewers

ldionne
mclow.lists
hans
EricWF

Commits

rGd2b33338a53e: Merging r340544: --------------------------------------------------------------…
rGcda06daf3f15: Comment out #define __cpp_lib_node_extract, we only support half of that…
rL340662: Merging r340544:
rL340544: Comment out #define __cpp_lib_node_extract, we only support half of that…
rCXX340544: Comment out #define __cpp_lib_node_extract, we only support half of that…

Summary

The other half of this is in https://reviews.llvm.org/D48896, so we shouldn't claim that we support this feature. This should be cherry-picked into the 7.0 release, since I believe the first half landed before the branch point.

Diff Detail

Repository: rCXX libc++

Event Timeline

erik.pilkington created this revision.Aug 23 2018, 9:59 AM

Herald added a reviewer: EricWF. · View Herald TranscriptAug 23 2018, 9:59 AM

Herald added subscribers: dexonsmith, christof. · View Herald Transcript

LGTM. Don't forget to update https://reviews.llvm.org/D48896 so it uncomments this. Also, this should be merged into LLVM 7.

This revision is now accepted and ready to land.Aug 23 2018, 10:02 AM

Landed as r340544. @hans: Can you cherry-pick?

Closed by commit rCXX340544: Comment out #define __cpp_lib_node_extract, we only support half of that… (authored by epilk). · Explain WhyAug 23 2018, 10:09 AM

This revision was automatically updated to reflect the committed changes.

In D51172#1211156, @erik.pilkington wrote:

Landed as r340544. @hans: Can you cherry-pick?

Merged in r340662. Thanks!

Revision Contents

Path

Size

include/

__node_handle

3 lines

Diff 162215

include/__node_handle

	Show All 20 Lines

	_LIBCPP_PUSH_MACROS			_LIBCPP_PUSH_MACROS
	#include <__undef_macros>			#include <__undef_macros>

	_LIBCPP_BEGIN_NAMESPACE_STD			_LIBCPP_BEGIN_NAMESPACE_STD

	#if _LIBCPP_STD_VER > 14			#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.			// Specialized in __tree & __hash_table for their _NodeType.
	template <class _NodeType, class _Alloc>			template <class _NodeType, class _Alloc>
	struct __generic_container_node_destructor;			struct __generic_container_node_destructor;

	template <class _NodeType, class _Alloc,			template <class _NodeType, class _Alloc,
	template <class, class> class _MapOrSetSpecifics>			template <class, class> class _MapOrSetSpecifics>
	class _LIBCPP_TEMPLATE_VIS __basic_node_handle			class _LIBCPP_TEMPLATE_VIS __basic_node_handle
	▲ Show 20 Lines • Show All 175 Lines • Show Last 20 Lines