From a3f25f0fe80f181afd32ec2eb403514a8d7aa5b4 Mon Sep 17 00:00:00 2001 From: redi Date: Wed, 11 Nov 2015 17:29:39 +0000 Subject: [PATCH] * libsupc++/new_handler.cc: Fix for explicit constructor change. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230184 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 2 ++ libstdc++-v3/libsupc++/new_handler.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index aba4f7e2612a..8f8f20cc16c0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,7 @@ 2015-11-11 Jonathan Wakely + * libsupc++/new_handler.cc: Fix for explicit constructor change. + PR libstdc++/60421 * include/std/thread (this_thread::sleep_for): Retry on EINTR. (this_thread::sleep_until): Retry if time not reached. diff --git a/libstdc++-v3/libsupc++/new_handler.cc b/libstdc++-v3/libsupc++/new_handler.cc index a09012c8db45..4da48b3c21dd 100644 --- a/libstdc++-v3/libsupc++/new_handler.cc +++ b/libstdc++-v3/libsupc++/new_handler.cc @@ -34,7 +34,7 @@ namespace } #endif -const std::nothrow_t std::nothrow = { }; +const std::nothrow_t std::nothrow = std::nothrow_t{ }; using std::new_handler; namespace -- 2.47.2