From fc75f86bca249ef8f76bbb9fbb765dd424869adc Mon Sep 17 00:00:00 2001 From: redi Date: Mon, 2 Mar 2015 16:50:24 +0000 Subject: [PATCH] PR libstdc++/64367 * include/std/stdexcept (__sso_string): Don't use non-static member in sizeof. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221118 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/std/stdexcept | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 093b318794e0..45a0f8c0b697 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-03-02 Jonathan Wakely + + PR libstdc++/64367 + * include/std/stdexcept (__sso_string): Don't use non-static member + in sizeof. + 2015-02-28 Matthias Klose PR libstdc++/65246 diff --git a/libstdc++-v3/include/std/stdexcept b/libstdc++-v3/include/std/stdexcept index bf3e618128c3..24289194d01a 100644 --- a/libstdc++-v3/include/std/stdexcept +++ b/libstdc++-v3/include/std/stdexcept @@ -80,7 +80,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION union { __str _M_s; - char _M_bytes[sizeof(_M_s)]; + char _M_bytes[sizeof(__str)]; }; __sso_string() _GLIBCXX_USE_NOEXCEPT; -- 2.47.2