From eed33268ffda4b25ae8d756d9e91a3425d5e96f4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 5 Nov 2011 13:33:29 +0000 Subject: [PATCH] re PR libstdc++/49894 ([C++0x] Uniform initialization in constructor) PR libstdc++/49894 PR bootstrap/50982 * include/std/mutex (once_flag): Use NSDMI. From-SVN: r181013 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/std/mutex | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 470c0c1f4eb..1d9c379f51b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2011-11-05 Jonathan Wakely + + PR libstdc++/49894 + PR bootstrap/50982 + * include/std/mutex (once_flag): Use NSDMI. + 2011-11-04 Benjamin Kosnik * scripts/run_doxygen: Fix sed quoting. diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index 4d154ff6f0c..321a332e548 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -760,11 +760,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { private: typedef __gthread_once_t __native_type; - __native_type _M_once; + __native_type _M_once = __GTHREAD_ONCE_INIT; public: /// Constructor - constexpr once_flag() noexcept : _M_once(__GTHREAD_ONCE_INIT) { } + constexpr once_flag() noexcept = default; /// Deleted copy constructor once_flag(const once_flag&) = delete;