summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Kashkarov <m.kashkarov@partner.samsung.com>2018-02-10 06:26:39 +0300
committerMikhail Kashkarov <m.kashkarov@partner.samsung.com>2018-04-13 15:55:42 +0300
commit5906dbb3f366091926e58b16ce4317bdd114eba8 (patch)
tree90b576450d98351d58053fa920497380048515fd
parent097c8c3da0f1e3a51289adacbd3d7e7c1c23b7d7 (diff)
downloadlinaro-gcc-5906dbb3f366091926e58b16ce4317bdd114eba8.tar.gz
linaro-gcc-5906dbb3f366091926e58b16ce4317bdd114eba8.tar.bz2
linaro-gcc-5906dbb3f366091926e58b16ce4317bdd114eba8.zip
Return commended basic_ostream.
Change-Id: I7ce8eb0a34e568967af7722fcb66500510045cdb
-rw-r--r--libstdc++-v3/include/bits/basic_string.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index e0807e3b215..4f180edd4dd 100644
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -2884,7 +2884,7 @@ _GLIBCXX_END_NAMESPACE_CXX11
struct _Rep : _Rep_base
{
friend class basic_string;
-// friend class basic_ostream;
+ friend class basic_ostream;
// Types:
typedef typename _Alloc::template rebind<char>::other _Raw_bytes_alloc;
typedef basic_string_asan_traits<_CharT, _CharT_alloc_type>
@@ -5657,9 +5657,9 @@ _GLIBCXX_END_NAMESPACE_CXX11
{
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 586. string inserter not a formatted function
-// __str.__annotate_delete();
+ __str.__annotate_delete();
return __ostream_insert(__os, __str.data(), __str.size());
-// __str.__annotate_new(__str.size());
+ __str.__annotate_new(__str.size());
}
/**