diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-03-02 16:50:24 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-03-02 16:50:24 +0000 |
| commit | e59a2e945eaaefc35355a4b8cc301981ab131e9e (patch) | |
| tree | ed74282add8abefdc7e0e5e4ea91aca6244f58d7 | |
| parent | d366a1a795d7b5c40abc3efae2dcc12e9e324b01 (diff) | |
| download | gcc-e59a2e945eaaefc35355a4b8cc301981ab131e9e.zip gcc-e59a2e945eaaefc35355a4b8cc301981ab131e9e.tar.gz gcc-e59a2e945eaaefc35355a4b8cc301981ab131e9e.tar.bz2 | |
re PR libstdc++/64367 (g++-v5/stdexcept:52:28: error: invalid use of non-static data member '_M_p')
PR libstdc++/64367
* include/std/stdexcept (__sso_string): Don't use non-static member
in sizeof.
From-SVN: r221118
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/stdexcept | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 093b318..45a0f8c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-03-02 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/64367 + * include/std/stdexcept (__sso_string): Don't use non-static member + in sizeof. + 2015-02-28 Matthias Klose <doko@ubuntu.com> PR libstdc++/65246 diff --git a/libstdc++-v3/include/std/stdexcept b/libstdc++-v3/include/std/stdexcept index bf3e618..2428919 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; |