[cfe-commits] [libcxx] r114129 - /libcxx/trunk/include/__config

Howard Hinnant hhinnant at apple.com
Thu Sep 16 16:27:26 PDT 2010


Author: hhinnant
Date: Thu Sep 16 18:27:26 2010
New Revision: 114129

URL: http://llvm.org/viewvc/llvm-project?rev=114129&view=rev
Log:
Tweak clang support for char16_t/char32_t

Modified:
    libcxx/trunk/include/__config

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=114129&r1=114128&r2=114129&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Thu Sep 16 18:27:26 2010
@@ -90,7 +90,8 @@
 #define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
+typedef __char16_t char16_t;
+typedef __char32_t char32_t;
 #endif
 
 #if !(__has_feature(cxx_exceptions))
@@ -220,13 +221,8 @@
 #endif  // defined(__GNUC__)
 
 #ifdef _LIBCPP_HAS_NO_UNICODE_CHARS
-#ifdef __clang__
-typedef __char16_t char16_t;
-typedef __char32_t char32_t;
-#else
 typedef unsigned short char16_t;
 typedef unsigned int   char32_t;
-#endif
 #endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
 
 #ifdef _LIBCPP_HAS_NO_STATIC_ASSERT





More information about the cfe-commits mailing list