From 8b6425215f80becd97d6312c2a9e414a1562a78c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sun, 21 Dec 2014 15:16:08 +0000 Subject: [PATCH] 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: Don't use non-static member in sizeof. From-SVN: r218997 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/stdexcept | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 60c90f753a9..54dabac154b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-12-21 Jonathan Wakely + + PR libstdc++/64367 + * include/std/stdexcept: Don't use non-static member in sizeof. + 2014-12-20 François Dumont * include/debug/vector (std::__debug::vector<>::clear()): Do not reset diff --git a/libstdc++-v3/include/std/stdexcept b/libstdc++-v3/include/std/stdexcept index c927f0539bb..e049a6eecd8 100644 --- a/libstdc++-v3/include/std/stdexcept +++ b/libstdc++-v3/include/std/stdexcept @@ -49,7 +49,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { union { const char* _M_p; - char _M_bytes[sizeof(_M_p)]; + char _M_bytes[sizeof(const char*)]; }; __cow_string(); -- 2.30.2