diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-07-19 07:02:49 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-07-19 07:02:49 +0000 |
| commit | 97a708bebca0e58714a1e005445ff28d0c1c2ca5 (patch) | |
| tree | ca5965646804934581ceb1c2894df9431a357e8c /include/string | |
| parent | 289ae9e3ac13cefd468cfb852e8b9f52e984de08 (diff) | |
Vendor import of libc++ trunk r308421:vendor/libc++/libc++-trunk-r308421
Diffstat (limited to 'include/string')
| -rw-r--r-- | include/string | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/string b/include/string index 010a4c7816ea..cf42f529c701 100644 --- a/include/string +++ b/include/string @@ -578,14 +578,7 @@ __basic_string_common<__b>::__throw_out_of_range() const _VSTD::__throw_out_of_range("basic_string"); } -#ifdef _LIBCPP_MSVC -#pragma warning( push ) -#pragma warning( disable: 4231 ) -#endif // _LIBCPP_MSVC _LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __basic_string_common<true>) -#ifdef _LIBCPP_MSVC -#pragma warning( pop ) -#endif // _LIBCPP_MSVC #ifdef _LIBCPP_NO_EXCEPTIONS template <class _Iter> @@ -4006,7 +3999,7 @@ basic_string<_CharT, _Traits, _Allocator>::__subscriptable(const const_iterator* _LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_string<char>) _LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_string<wchar_t>) -_LIBCPP_EXTERN_TEMPLATE(string operator+<char, char_traits<char>, allocator<char> >(char const*, string const&)) +_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS string operator+<char, char_traits<char>, allocator<char> >(char const*, string const&)) #if _LIBCPP_STD_VER > 11 // Literal suffixes for basic_string [basic.string.literals] |