* include/bits/locale_conv.h (__do_str_codecvt): Set __count.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224985 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 47777ac7c498f08a0b491191f0fd7f10a9994401..7b7e2b9c1f55f886998fb890376f3e136810373d 100644 (file)
--- 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 fd99499b8f6bc5755f26820e08338ef2bf5fe86c..146f78b38d0704041eb519d63e0a7bde52d162ed 100644 (file)
--- 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;
        }