From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Tue, 25 Oct 2011 21:44:12 +0000 (+0000)
Subject: condition_variable (condition_variable_any): Remove unused native_handle_type typedef.
X-Git-Tag: releases/gcc-4.7.0~2814
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fd72195bc3c6f1d40827c6eb793e619d6ec5f50;p=thirdparty%2Fgcc.git

condition_variable (condition_variable_any): Remove unused native_handle_type typedef.

	* include/std/condition_variable (condition_variable_any): Remove
	unused native_handle_type typedef.
	* src/condition_variable.cc (condition_variable): Add missing noexcept
	specifications.
	* 30_threads/condition_variable_any/requirements/typedefs.cc: Remove.

From-SVN: r180454
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a35ae193f477..3b4b11d62870 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-25  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* include/std/condition_variable (condition_variable_any): Remove
+	unused native_handle_type typedef.
+	* src/condition_variable.cc (condition_variable): Add missing noexcept
+	specifications.
+	* 30_threads/condition_variable_any/requirements/typedefs.cc: Remove.
+
 2011-10-25  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	PR libstdc++/50862
diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable
index e17f32635685..efc4a64ef1d2 100644
--- a/libstdc++-v3/include/std/condition_variable
+++ b/libstdc++-v3/include/std/condition_variable
@@ -177,7 +177,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     mutex				_M_mutex;
 
   public:
-    typedef condition_variable::native_handle_type	native_handle_type;
 
     condition_variable_any() noexcept;
     ~condition_variable_any() noexcept;
diff --git a/libstdc++-v3/src/condition_variable.cc b/libstdc++-v3/src/condition_variable.cc
index 6f9cd0b04b0c..400fcf3546af 100644
--- a/libstdc++-v3/src/condition_variable.cc
+++ b/libstdc++-v3/src/condition_variable.cc
@@ -31,8 +31,8 @@ namespace std _GLIBCXX_VISIBILITY(default)
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 #ifdef __GTHREAD_COND_INIT
-  condition_variable::condition_variable() = default;
-  condition_variable::~condition_variable() = default;
+  condition_variable::condition_variable() noexcept = default;
+  condition_variable::~condition_variable() noexcept = default;
 #else
   condition_variable::condition_variable() noexcept
   {
diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/requirements/typedefs.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/requirements/typedefs.cc
deleted file mode 100644
index 8a6fd82ccf62..000000000000
--- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/requirements/typedefs.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// { dg-do compile }
-// { dg-options "-std=gnu++0x" }
-// { dg-require-cstdint "" }
-// { dg-require-gthreads "" }
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <condition_variable>
-
-void test01()
-{
-  // Check for required typedefs
-  typedef std::condition_variable_any test_type;
-  typedef test_type::native_handle_type type;
-}