From: Jonathan Wakely <jwakely@redhat.com>
Date: Sun, 21 Dec 2014 15:16:08 +0000 (+0000)
Subject: re PR libstdc++/64367 (g++-v5/stdexcept:52:28: error: invalid use of non-static data... 
X-Git-Tag: releases/gcc-5.1.0~2206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b6425215f80becd97d6312c2a9e414a1562a78c;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 60c90f753a95..54dabac154ba 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-21  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/64367
+	* include/std/stdexcept: Don't use non-static member in sizeof.
+
 2014-12-20  François Dumont  <fdumont@gcc.gnu.org>
 
 	* 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 c927f0539bbb..e049a6eecd84 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();