re PR libstdc++/64367 (g++-v5/stdexcept:52:28: error: invalid use of non-static data...

	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 093b318794e076f01bbf30790ca3151975bc71b2..45a0f8c0b697b21bd1f72877dcd28228801f354f 100644 (file)
--- 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 bf3e618128c3dbab8955652065cd1442f95240c1..24289194d01afbe079f57778a0dd16873682229e 100644 (file)
--- 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;