aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2015-06-12 11:26:05 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2015-06-12 11:26:05 +0100
commit6a3d0bb327ccf64c0da4f21889ac4a2756569cb5 (patch)
treeb21b4758474b93dd6689de3adbffb27ea6da3de7
parent500a08b263568b14d0f3144e470e8d597e1aaf7a (diff)
downloadgcc-6a3d0bb327ccf64c0da4f21889ac4a2756569cb5.zip
gcc-6a3d0bb327ccf64c0da4f21889ac4a2756569cb5.tar.gz
gcc-6a3d0bb327ccf64c0da4f21889ac4a2756569cb5.tar.bz2
re PR libstdc++/66464 (codecvt_utf16 max_length returning incorrect value)
PR libstdc++/66464 * src/c++11/codecvt.cc (codecvt_utf16_base<char32_t>::do_max_length): Return 4 not 3. From-SVN: r224415
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/src/c++11/codecvt.cc2
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7bc4919..7a22ab9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-12 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/66464
+ * src/c++11/codecvt.cc (codecvt_utf16_base<char32_t>::do_max_length):
+ Return 4 not 3.
+
2015-06-12 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
PR c++/66192
diff --git a/libstdc++-v3/src/c++11/codecvt.cc b/libstdc++-v3/src/c++11/codecvt.cc
index 2a11ca3..6b82aa8 100644
--- a/libstdc++-v3/src/c++11/codecvt.cc
+++ b/libstdc++-v3/src/c++11/codecvt.cc
@@ -1124,7 +1124,7 @@ do_length(state_type&, const extern_type* __from,
int
__codecvt_utf16_base<char32_t>::do_max_length() const throw()
-{ return 3; }
+{ return 4; }
#ifdef _GLIBCXX_USE_WCHAR_T
// Define members of codecvt_utf16<wchar_t> base class implementation.