From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 22 Dec 2014 18:58:44 +0000 (+0000)
Subject: basic_string.h: Fix _S_local_capacity for large sizeof(_CharT).
X-Git-Tag: releases/gcc-5.1.0~2185
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59aa28e80f8614657fcc75ba60a7014107487f83;p=thirdparty%2Fgcc.git

basic_string.h: Fix _S_local_capacity for large sizeof(_CharT).

2014-12-22  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/basic_string.h: Fix _S_local_capacity for
	large sizeof(_CharT).

From-SVN: r219031
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 29acd9750251..bd9318debbd7 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/bits/basic_string.h: Fix _S_local_capacity for
+	large sizeof(_CharT).
+
 2014-12-22  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/37522
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 6423c59ede25..6347cb21afcf 100644
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -114,7 +114,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
       _Alloc_hider	_M_dataplus;
       size_type		_M_string_length;
 
-      enum { _S_local_capacity = 16 / sizeof(_CharT) - 1 };
+      enum { _S_local_capacity = 15 / sizeof(_CharT) };
 
       union
       {