From 6a3d0bb327ccf64c0da4f21889ac4a2756569cb5 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 12 Jun 2015 11:26:05 +0100
Subject: [PATCH] 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
---
 libstdc++-v3/ChangeLog            | 6 ++++++
 libstdc++-v3/src/c++11/codecvt.cc | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7bc491979a2..7a22ab9ad7e 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 2a11ca3130f..6b82aa853e7 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.
-- 
2.30.2