From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 12 Jun 2015 10:26:05 +0000 (+0000)
Subject: 	PR libstdc++/66464
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af0b06c72817386e0ebdcc6c81500659aa1436de;p=thirdparty%2Fgcc.git

	PR libstdc++/66464
	* src/c++11/codecvt.cc (codecvt_utf16_base<char32_t>::do_max_length):
	Return 4 not 3.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7bc491979a27..7a22ab9ad7ed 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 2a11ca3130f8..6b82aa853e7e 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.