diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-07-19 11:52:55 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-07-19 11:52:55 +0000 |
| commit | e068c7463f21ab232982ddebe34e6cd610ffc175 (patch) | |
| tree | 96a0acc779e8eea4ed6107555eaa61d8bcc78473 /libcxx/include/string | |
| parent | 06841eab009445ee455d85dc9eee17d3a214bb7d (diff) | |
| download | bcm5719-llvm-e068c7463f21ab232982ddebe34e6cd610ffc175.tar.gz bcm5719-llvm-e068c7463f21ab232982ddebe34e6cd610ffc175.zip | |
[libc++] Fix link error with _LIBCPP_HIDE_FROM_ABI_PER_TU and std::string
Summary:
This is effectively a revert of r344616, which was a partial fix for
PR38964 (compilation of <string> with GCC in C++03 mode). However, that
configuration is explicitly not supported anymore and that partial fix
breaks compilation with Clang when per-TU insulation is provided.
PR42676
rdar://52899715
Reviewers: mclow.lists, EricWF
Subscribers: christof, jkorous, dexonsmith, libcxx-commits
Tags: #libc
Differential Revision: https://reviews.llvm.org/D64941
llvm-svn: 366567
Diffstat (limited to 'libcxx/include/string')
| -rw-r--r-- | libcxx/include/string | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libcxx/include/string b/libcxx/include/string index 1e5b09800c6..8adf6d97c00 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -812,9 +812,7 @@ public: basic_string(basic_string&& __str, const allocator_type& __a); #endif // _LIBCPP_CXX03_LANG -#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES template <class = typename enable_if<__is_allocator<_Allocator>::value, nullptr_t>::type> -#endif _LIBCPP_INLINE_VISIBILITY basic_string(const _CharT* __s) { _LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*) detected nullptr"); @@ -824,9 +822,7 @@ public: # endif } -#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES template <class = typename enable_if<__is_allocator<_Allocator>::value, nullptr_t>::type> -#endif _LIBCPP_INLINE_VISIBILITY basic_string(const _CharT* __s, const _Allocator& __a); @@ -837,9 +833,7 @@ public: _LIBCPP_INLINE_VISIBILITY basic_string(size_type __n, _CharT __c); -#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES template <class = typename enable_if<__is_allocator<_Allocator>::value, nullptr_t>::type> -#endif _LIBCPP_INLINE_VISIBILITY basic_string(size_type __n, _CharT __c, const _Allocator& __a); @@ -1800,9 +1794,7 @@ basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s, size_ty } template <class _CharT, class _Traits, class _Allocator> -#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES template <class> -#endif basic_string<_CharT, _Traits, _Allocator>::basic_string(const _CharT* __s, const _Allocator& __a) : __r_(__second_tag(), __a) { @@ -1939,9 +1931,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, _CharT __ } template <class _CharT, class _Traits, class _Allocator> -#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES template <class> -#endif basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, _CharT __c, const _Allocator& __a) : __r_(__second_tag(), __a) { |
