This is an archive of the discontinued LLVM Phabricator instance.

[libcxx] use clang's __char16_t and __char32_t definitions on Linux in C++03 mode.
ClosedPublic

Authored by EricWF on Oct 23 2014, 12:57 AM.

Download Raw Diff

Details

Reviewers

mclow.lists
danalbert
jroelofs
EricWF

Commits

rGb494e5d19893: [libcxx] use clang's __char16_t and __char32_t definitions on Linux in C++03…
rCXX220716: [libcxx] use clang's __char16_t and __char32_t definitions on Linux in C++03…
rL220716: [libcxx] use clang's __char16_t and __char32_t definitions on Linux in C++03…

Summary

This fixes ODR violations in C++03 mode in test/localization/locale.stdcvt. The special case for linux was introduced in 2010 before clang always defined char16_t and char32_t.

Diff Detail

Event Timeline

EricWF updated this revision to Diff 15306.Oct 23 2014, 12:57 AM

EricWF retitled this revision from to [libcxx] use clang's __char16_t and __char32_t definitions on Linux in C++03 mode..

EricWF updated this object.

EricWF edited the test plan for this revision. (Show Details)

EricWF added reviewers: mclow.lists, danalbert, jroelofs.

EricWF added a subscriber: Unknown Object (MLST).

clang 3.3 defines __char*_t and this patch was agreed upon by mclow during offline discussions.

This revision is now accepted and ready to land.Oct 27 2014, 1:38 PM

EricWF closed this revision.Oct 27 2014, 1:39 PM

Revision Contents

Path

Size

include/

__config

4 lines

Diff 15306

include/__config

Context not available.
	#endif	#endif

	#if __cplusplus < 201103L	#if __cplusplus < 201103L
	#ifdef __linux__
	#define _LIBCPP_HAS_NO_UNICODE_CHARS
	#else
	typedef __char16_t char16_t;	typedef __char16_t char16_t;
	typedef __char32_t char32_t;	typedef __char32_t char32_t;
	#endif	#endif
	#endif

	#if !(__has_feature(cxx_exceptions))	#if !(__has_feature(cxx_exceptions))
	#define _LIBCPP_NO_EXCEPTIONS	#define _LIBCPP_NO_EXCEPTIONS
Context not available.