diff options
| author | jamborm <jamborm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-07-31 14:52:19 +0000 |
|---|---|---|
| committer | jamborm <jamborm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-07-31 14:52:19 +0000 |
| commit | b31856d3ac23cf3dab1e95cb96230dc81564c84a (patch) | |
| tree | 49524df297e69390449c3ef5037b2360d14c7b1a /libstdc++-v3/include/bits/basic_string.h | |
| parent | 1ade4d1864f2cf61eb5c045f57c0bcac80943c04 (diff) | |
| parent | a168a775e93ec31ae743ad282d8e60fa1c116891 (diff) | |
| download | gcc-b31856d3ac23cf3dab1e95cb96230dc81564c84a.tar.gz | |
Merged trunk revision 250739 into the hsa branch
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/hsa@250744 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/basic_string.h')
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 519d686063e..a343d7b1628 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -2918,7 +2918,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 int compare(size_type __pos, size_type __n1, const _CharT* __s, size_type __n2) const; - }; + + // Allow basic_stringbuf::__xfer_bufptrs to call _M_length: + template<typename, typename, typename> friend class basic_stringbuf; + }; _GLIBCXX_END_NAMESPACE_CXX11 #else // !_GLIBCXX_USE_CXX11_ABI // Reference-counted COW string implentation @@ -6467,8 +6470,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { }; #endif -_GLIBCXX_END_NAMESPACE_VERSION - #if __cplusplus > 201103L #define __cpp_lib_string_udls 201304 @@ -6477,8 +6478,6 @@ _GLIBCXX_END_NAMESPACE_VERSION { inline namespace string_literals { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - _GLIBCXX_DEFAULT_ABI_TAG inline basic_string<char> operator""s(const char* __str, size_t __len) @@ -6503,12 +6502,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return basic_string<char32_t>{__str, __len}; } #endif -_GLIBCXX_END_NAMESPACE_VERSION } // inline namespace string_literals } // inline namespace literals #endif // __cplusplus > 201103L +_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // C++11 |