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

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

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 29acd9750251dca3d61538c6b6a83da09ebe2126..bd9318debbd7df01037a1d6781cdfc7a659ebbd4 100644 (file)
--- 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 6423c59ede25149e9740e7fc28328d5d1e3bd144..6347cb21afcf716fbc9f03c882066b4b4781ee7c 100644 (file)
--- 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
       {