diff options
| -rw-r--r-- | libcxx/include/__config | 5 | ||||
| -rw-r--r-- | libcxx/include/iterator | 6 | ||||
| -rwxr-xr-x | libcxx/lib/buildit | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index ebd71c6e4fd..9f9a6150ea2 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -220,8 +220,13 @@ using namespace _LIBCPP_NAMESPACE __attribute__((__strong__)); #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 diff --git a/libcxx/include/iterator b/libcxx/include/iterator index cda778f73d7..33becab9020 100644 --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -151,7 +151,7 @@ public: 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 @@ public: 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 @@ public: 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); diff --git a/libcxx/lib/buildit b/libcxx/lib/buildit index 4b07113e559..0b51b2d7f0f 100755 --- a/libcxx/lib/buildit +++ b/libcxx/lib/buildit @@ -14,7 +14,7 @@ fi if [ -z "$CXX" ] then - CXX=g++ + CXX=clang++ fi if [ -z $MACOSX_DEPLOYMENT_TARGET ] |
