diff options
| author | theraven <theraven@FreeBSD.org> | 2012-11-13 03:27:43 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2012-11-13 03:27:43 +0000 |
| commit | 8af97236b44c01761e1294025653d7f19dac7dd9 (patch) | |
| tree | b0b795ada355b89fa0679851158e12e7b0af551d /contrib/libc++/include/string | |
| parent | af2fb35f8e88c3065ae59da7ac18d1bd2a3aca56 (diff) | |
| download | FreeBSD-src-8af97236b44c01761e1294025653d7f19dac7dd9.zip FreeBSD-src-8af97236b44c01761e1294025653d7f19dac7dd9.tar.gz | |
Import new version of libc++ into base.
Diffstat (limited to 'contrib/libc++/include/string')
| -rw-r--r-- | contrib/libc++/include/string | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/libc++/include/string b/contrib/libc++/include/string index 89a00e5..5bf42f0 100644 --- a/contrib/libc++/include/string +++ b/contrib/libc++/include/string @@ -1031,7 +1031,7 @@ __basic_string_common<__b>::__throw_out_of_range() const #pragma warning( push ) #pragma warning( disable: 4231 ) #endif // _MSC_VER -extern template class __basic_string_common<true>; +_LIBCPP_EXTERN_TEMPLATE(class __basic_string_common<true>) #ifdef _MSC_VER #pragma warning( pop ) #endif // _MSC_VER @@ -1094,14 +1094,14 @@ private: union { unsigned char __size_; - value_type _; + value_type __lx; }; value_type __data_[__min_cap]; }; - union _{__long _; __short __;}; + union __lx{__long __lx; __short __lxx;}; - enum {__n_words = sizeof(_) / sizeof(size_type)}; + enum {__n_words = sizeof(__lx) / sizeof(size_type)}; struct __raw { @@ -3975,8 +3975,8 @@ getline(basic_istream<_CharT, _Traits>&& __is, #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -extern template class basic_string<char>; -extern template class basic_string<wchar_t>; +_LIBCPP_EXTERN_TEMPLATE(class basic_string<char>) +_LIBCPP_EXTERN_TEMPLATE(class basic_string<wchar_t>) extern template string |
