[cfe-commits] [libcxx] r113842 - in /libcxx/trunk: include/__config include/iterator lib/buildit

Howard Hinnant hhinnant at apple.com
Tue Sep 14 13:26:29 PDT 2010


Author: hhinnant
Date: Tue Sep 14 15:26:27 2010
New Revision: 113842

URL: http://llvm.org/viewvc/llvm-project?rev=113842&view=rev
Log:
Cement ABI on clang for char16_t and char32_t.  Also fixed some comments in <iterator>.

Modified:
    libcxx/trunk/include/__config
    libcxx/trunk/include/iterator
    libcxx/trunk/lib/buildit

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=113842&r1=113841&r2=113842&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Tue Sep 14 15:26:27 2010
@@ -220,8 +220,13 @@
 #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

Modified: libcxx/trunk/include/iterator
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/iterator?rev=113842&r1=113841&r2=113842&view=diff
==============================================================================
--- libcxx/trunk/include/iterator (original)
+++ libcxx/trunk/include/iterator Tue Sep 14 15:26:27 2010
@@ -151,7 +151,7 @@
     typedef void                        pointer;
 
     explicit back_insert_iterator(Container& x);
-    back_insert_iterator& operator=(const typename _Container::value_type& value);
+    back_insert_iterator& operator=(const typename Container::value_type& value);
     back_insert_iterator& operator*();
     back_insert_iterator& operator++();
     back_insert_iterator  operator++(int);
@@ -172,7 +172,7 @@
     typedef void                         pointer;
 
     explicit front_insert_iterator(Container& x);
-    front_insert_iterator& operator=(const typename _Container::value_type& value);
+    front_insert_iterator& operator=(const typename Container::value_type& value);
     front_insert_iterator& operator*();
     front_insert_iterator& operator++();
     front_insert_iterator  operator++(int);
@@ -194,7 +194,7 @@
     typedef void                   pointer;
 
     insert_iterator(Container& x, typename Container::iterator i);
-    insert_iterator& operator=(const typename _Container::value_type& value);
+    insert_iterator& operator=(const typename Container::value_type& value);
     insert_iterator& operator*();
     insert_iterator& operator++();
     insert_iterator& operator++(int);

Modified: libcxx/trunk/lib/buildit
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/buildit?rev=113842&r1=113841&r2=113842&view=diff
==============================================================================
--- libcxx/trunk/lib/buildit (original)
+++ libcxx/trunk/lib/buildit Tue Sep 14 15:26:27 2010
@@ -14,7 +14,7 @@
 
 if [ -z "$CXX" ]
 then
-	CXX=g++
+	CXX=clang++
 fi
 
 if [ -z $MACOSX_DEPLOYMENT_TARGET ]





More information about the cfe-commits mailing list