summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2014-10-27 20:29:05 +0000
committerEric Fiselier <eric@efcs.ca>2014-10-27 20:29:05 +0000
commitb494e5d19893cf137a5e0576079968f1b86a8a28 (patch)
tree4831d70dc060935d2f7fbf047da699a9440da2f5
parent847ee13171e34a7cebf3cf9f7498a60f0cac8a4d (diff)
downloadbcm5719-llvm-b494e5d19893cf137a5e0576079968f1b86a8a28.tar.gz
bcm5719-llvm-b494e5d19893cf137a5e0576079968f1b86a8a28.zip
[libcxx] use clang's __char16_t and __char32_t definitions on Linux in C++03 mode.
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. Reviewers: mclow.lists, danalbert, jroelofs, EricWF Reviewed By: EricWF Subscribers: cfe-commits Differential Revision: http://reviews.llvm.org/D5930 llvm-svn: 220716
-rw-r--r--libcxx/include/__config4
1 files changed, 0 insertions, 4 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 08ca6006f60..d34bb7cc28a 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -226,13 +226,9 @@
#endif
#if __cplusplus < 201103L
-#ifdef __linux__
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#else
typedef __char16_t char16_t;
typedef __char32_t char32_t;
#endif
-#endif
#if !(__has_feature(cxx_exceptions))
#define _LIBCPP_NO_EXCEPTIONS
OpenPOWER on IntegriCloud