diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2011-10-25 21:44:12 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2011-10-25 22:44:12 +0100 |
| commit | 0fd72195bc3c6f1d40827c6eb793e619d6ec5f50 (patch) | |
| tree | cc0616d6f82c7bf6c7b570c75525ab42672f9dae | |
| parent | 152a50a993d65065d0c349f3cd4284f5fb995b1d (diff) | |
| download | gcc-0fd72195bc3c6f1d40827c6eb793e619d6ec5f50.zip gcc-0fd72195bc3c6f1d40827c6eb793e619d6ec5f50.tar.gz gcc-0fd72195bc3c6f1d40827c6eb793e619d6ec5f50.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/condition_variable | 1 | ||||
| -rw-r--r-- | libstdc++-v3/src/condition_variable.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/30_threads/condition_variable_any/requirements/typedefs.cc | 30 |
4 files changed, 10 insertions, 33 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a35ae19..3b4b11d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 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 * include/std/condition_variable (condition_variable_any::wait): Fix deadlock and ensure _Lock::lock() is called on exit. diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable index e17f326..efc4a64 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 6f9cd0b..400fcf3 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 8a6fd82..0000000 --- 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; -} |