diff options
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/stdexcept | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 60c90f7..54dabac 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 c927f05..e049a6e 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(); |