From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 2 Mar 2015 16:50:24 +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~664
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e59a2e945eaaefc35355a4b8cc301981ab131e9e;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 (__sso_string): Don't use non-static member
	in sizeof.

From-SVN: r221118
---

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