aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2015-06-25 19:23:41 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2015-06-25 19:23:41 +0100
commit67b0404e1241f698f6bc5f5fc0b347565a35e599 (patch)
tree8398728bb4985ddae5b3d09c057c6d55ef9d4a89 /libstdc++-v3
parent994c5d85429afb040d3e178c6647e8f91e6092a7 (diff)
downloadgcc-67b0404e1241f698f6bc5f5fc0b347565a35e599.zip
gcc-67b0404e1241f698f6bc5f5fc0b347565a35e599.tar.gz
gcc-67b0404e1241f698f6bc5f5fc0b347565a35e599.tar.bz2
* include/bits/locale_conv.h (__do_str_codecvt): Set __count.
From-SVN: r224985
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/bits/locale_conv.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 47777ac..7b7e2b9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-25 Jonathan Wakely <jwakely@redhat.com>
+
+ * include/bits/locale_conv.h (__do_str_codecvt): Set __count.
+
2015-06-24 François Dumont <fdumont@gcc.gnu.org>
* include/bits/basic_string.h (basic_string<>::front()): Add !empty
diff --git a/libstdc++-v3/include/bits/locale_conv.h b/libstdc++-v3/include/bits/locale_conv.h
index fd99499..146f78b 100644
--- a/libstdc++-v3/include/bits/locale_conv.h
+++ b/libstdc++-v3/include/bits/locale_conv.h
@@ -61,6 +61,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
if (__first == __last)
{
__outstr.clear();
+ __count = 0;
return true;
}