From 1c6f4a147dd2e18e9a03b2a275ac9050edc0c3d4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 17 Mar 2015 16:36:32 +0000 Subject: [PATCH] 1.cc: Remove name of unused exception variable. * testsuite/30_threads/shared_lock/modifiers/1.cc: Remove name of unused exception variable. * testsuite/30_threads/unique_lock/modifiers/1.cc: Likewise. * testsuite/30_threads/shared_lock/modifiers/2.cc: Remove duplicate test. * testsuite/30_threads/unique_lock/modifiers/2.cc: Likewise. From-SVN: r221477 --- libstdc++-v3/ChangeLog | 7 ++ .../30_threads/shared_lock/modifiers/1.cc | 2 +- .../30_threads/shared_lock/modifiers/2.cc | 68 ------------------- .../30_threads/unique_lock/modifiers/1.cc | 2 +- .../30_threads/unique_lock/modifiers/2.cc | 68 ------------------- 5 files changed, 9 insertions(+), 138 deletions(-) delete mode 100644 libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/2.cc delete mode 100644 libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/2.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ce12e81ab5f..103d7098adb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -5,6 +5,13 @@ * testsuite/18_support/nested_exception/throw_with_nested.cc: Test final class. + * testsuite/30_threads/shared_lock/modifiers/1.cc: Remove name of + unused exception variable. + * testsuite/30_threads/unique_lock/modifiers/1.cc: Likewise. + * testsuite/30_threads/shared_lock/modifiers/2.cc: Remove duplicate + test. + * testsuite/30_threads/unique_lock/modifiers/2.cc: Likewise. + 2015-03-13 Jonathan Wakely * acinclude.m4: Make --enable-libstdcxx-time=auto work for dragonfly. diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc index 2d615829ab1..9f200395537 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc @@ -55,7 +55,7 @@ int main() VERIFY( !(bool)l1 ); VERIFY( (bool)l2 ); } - catch (const std::system_error& e) + catch (const std::system_error&) { VERIFY( false ); } diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/2.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/2.cc deleted file mode 100644 index 9f200395537..00000000000 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/2.cc +++ /dev/null @@ -1,68 +0,0 @@ -// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } } -// { dg-options " -std=gnu++14 -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* powerpc-ibm-aix* } } -// { dg-options " -std=gnu++14 -pthreads" { target *-*-solaris* } } -// { dg-options " -std=gnu++14 " { target *-*-cygwin *-*-darwin* } } -// { dg-require-cstdint "" } -// { dg-require-gthreads "" } - -// Copyright (C) 2013-2015 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 -// . - - -#include -#include -#include - -int main() -{ - bool test __attribute__((unused)) = true; - typedef std::shared_timed_mutex mutex_type; - typedef std::shared_lock lock_type; - - try - { - mutex_type m; - lock_type l1(m); - lock_type l2; - - try - { - l1.swap(l2); - } - catch (const std::system_error&) - { - VERIFY( false ); - } - catch(...) - { - VERIFY( false ); - } - - VERIFY( !(bool)l1 ); - VERIFY( (bool)l2 ); - } - catch (const std::system_error&) - { - VERIFY( false ); - } - catch (...) - { - VERIFY( false ); - } - - return 0; -} diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc index 917b0fb12d9..ffb9fe4326d 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc @@ -55,7 +55,7 @@ int main() VERIFY( !(bool)l1 ); VERIFY( (bool)l2 ); } - catch (const std::system_error& e) + catch (const std::system_error&) { VERIFY( false ); } diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/2.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/2.cc deleted file mode 100644 index ffb9fe4326d..00000000000 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/2.cc +++ /dev/null @@ -1,68 +0,0 @@ -// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } } -// { dg-options " -std=gnu++11 -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } } -// { dg-options " -std=gnu++11 -pthreads" { target *-*-solaris* } } -// { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-darwin* } } -// { dg-require-cstdint "" } -// { dg-require-gthreads "" } - -// Copyright (C) 2008-2015 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 -// . - - -#include -#include -#include - -int main() -{ - bool test __attribute__((unused)) = true; - typedef std::mutex mutex_type; - typedef std::unique_lock lock_type; - - try - { - mutex_type m; - lock_type l1(m); - lock_type l2; - - try - { - l1.swap(l2); - } - catch (const std::system_error&) - { - VERIFY( false ); - } - catch(...) - { - VERIFY( false ); - } - - VERIFY( !(bool)l1 ); - VERIFY( (bool)l2 ); - } - catch (const std::system_error&) - { - VERIFY( false ); - } - catch (...) - { - VERIFY( false ); - } - - return 0; -} -- 2.30.2