From 59aa28e80f8614657fcc75ba60a7014107487f83 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 22 Dec 2014 18:58:44 +0000 Subject: [PATCH] basic_string.h: Fix _S_local_capacity for large sizeof(_CharT). 2014-12-22 Paolo Carlini * include/bits/basic_string.h: Fix _S_local_capacity for large sizeof(_CharT). From-SVN: r219031 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/basic_string.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 29acd975025..bd9318debbd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-12-22 Paolo Carlini + + * include/bits/basic_string.h: Fix _S_local_capacity for + large sizeof(_CharT). + 2014-12-22 Jonathan Wakely PR libstdc++/37522 diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 6423c59ede2..6347cb21afc 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 {