aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2014-12-22 18:58:44 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2014-12-22 18:58:44 +0000
commit59aa28e80f8614657fcc75ba60a7014107487f83 (patch)
tree0c4ffb9e74312f8bca3ceb2da0a2914595adc2c3
parent17839acd9d9e2973fefd399bfaaa4c82d0b81687 (diff)
downloadgcc-59aa28e80f8614657fcc75ba60a7014107487f83.zip
gcc-59aa28e80f8614657fcc75ba60a7014107487f83.tar.gz
gcc-59aa28e80f8614657fcc75ba60a7014107487f83.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/basic_string.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 29acd97..bd9318d 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 6423c59..6347cb2 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
{