summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/std/mutex4
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 <jwakely.gcc@gmail.com>
+
+ PR libstdc++/49894
+ PR bootstrap/50982
+ * include/std/mutex (once_flag): Use NSDMI.
+
2011-11-04 Benjamin Kosnik <bkoz@redhat.com>
* 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;