From 194a9d67be45568d81bb8c17e9102e31c1309e5f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 14 Jan 2021 14:25:05 +0000 Subject: [PATCH] libstdc++: Update copyright dates on new files The patch adding these files was approved in 2020 but it wasn't committed until 2021, so the copyright years were not updated along with the years in all the existing files. libstdc++-v3/ChangeLog: * include/std/barrier: Update copyright years. Fix whitespace. * include/std/version: Fix whitespace. * testsuite/30_threads/barrier/1.cc: Update copyright years. * testsuite/30_threads/barrier/2.cc: Likewise. * testsuite/30_threads/barrier/arrive.cc: Likewise. * testsuite/30_threads/barrier/arrive_and_drop.cc: Likewise. * testsuite/30_threads/barrier/arrive_and_wait.cc: Likewise. * testsuite/30_threads/barrier/completion.cc: Likewise. --- libstdc++-v3/include/std/barrier | 4 ++-- libstdc++-v3/include/std/version | 4 ++-- libstdc++-v3/testsuite/30_threads/barrier/1.cc | 2 +- libstdc++-v3/testsuite/30_threads/barrier/2.cc | 2 +- libstdc++-v3/testsuite/30_threads/barrier/arrive.cc | 2 +- libstdc++-v3/testsuite/30_threads/barrier/arrive_and_drop.cc | 2 +- libstdc++-v3/testsuite/30_threads/barrier/arrive_and_wait.cc | 2 +- libstdc++-v3/testsuite/30_threads/barrier/completion.cc | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libstdc++-v3/include/std/barrier b/libstdc++-v3/include/std/barrier index f1143da89b4..e09212dfcb9 100644 --- a/libstdc++-v3/include/std/barrier +++ b/libstdc++-v3/include/std/barrier @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2020 Free Software Foundation, Inc. +// Copyright (C) 2020-2021 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 @@ -103,7 +103,7 @@ It looks different from literature pseudocode for two main reasons: static_cast<__barrier_phase_t>(__old_phase_val + 2); size_t __current_expected = _M_expected; - std::hash__hasher; + std::hash __hasher; size_t __current = __hasher(std::this_thread::get_id()) % ((_M_expected + 1) >> 1); diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 9516558d8b4..e3d52b88c21 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -200,8 +200,8 @@ #if defined _GLIBCXX_HAS_GTHREADS || defined _GLIBCXX_HAVE_LINUX_FUTEX # define __cpp_lib_atomic_wait 201907L # if __cpp_aligned_new -# define __cpp_lib_barrier 201907L -#endif +# define __cpp_lib_barrier 201907L +# endif #endif #define __cpp_lib_bind_front 201907L #if __has_builtin(__builtin_bit_cast) diff --git a/libstdc++-v3/testsuite/30_threads/barrier/1.cc b/libstdc++-v3/testsuite/30_threads/barrier/1.cc index 4c15deb1398..a21fae32127 100644 --- a/libstdc++-v3/testsuite/30_threads/barrier/1.cc +++ b/libstdc++-v3/testsuite/30_threads/barrier/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Free Software Foundation, Inc. +// Copyright (C) 2020-2021 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 diff --git a/libstdc++-v3/testsuite/30_threads/barrier/2.cc b/libstdc++-v3/testsuite/30_threads/barrier/2.cc index 0fac1ef3f3c..94e37d739da 100644 --- a/libstdc++-v3/testsuite/30_threads/barrier/2.cc +++ b/libstdc++-v3/testsuite/30_threads/barrier/2.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2019-2020 Free Software Foundation, Inc. +// Copyright (C) 2020-2021 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 diff --git a/libstdc++-v3/testsuite/30_threads/barrier/arrive.cc b/libstdc++-v3/testsuite/30_threads/barrier/arrive.cc index 6e64e378cb0..fb0f56292c0 100644 --- a/libstdc++-v3/testsuite/30_threads/barrier/arrive.cc +++ b/libstdc++-v3/testsuite/30_threads/barrier/arrive.cc @@ -3,7 +3,7 @@ // { dg-require-gthreads "" } // { dg-additional-options "-pthread" { target pthread } } -// Copyright (C) 2020 Free Software Foundation, Inc. +// Copyright (C) 2020-2021 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 diff --git a/libstdc++-v3/testsuite/30_threads/barrier/arrive_and_drop.cc b/libstdc++-v3/testsuite/30_threads/barrier/arrive_and_drop.cc index 55f40e17062..22b40200c80 100644 --- a/libstdc++-v3/testsuite/30_threads/barrier/arrive_and_drop.cc +++ b/libstdc++-v3/testsuite/30_threads/barrier/arrive_and_drop.cc @@ -3,7 +3,7 @@ // { dg-require-gthreads "" } // { dg-additional-options "-pthread" { target pthread } } -// Copyright (C) 2020 Free Software Foundation, Inc. +// Copyright (C) 2020-2021 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 diff --git a/libstdc++-v3/testsuite/30_threads/barrier/arrive_and_wait.cc b/libstdc++-v3/testsuite/30_threads/barrier/arrive_and_wait.cc index 2a3a69ae3c0..f9b4fa29063 100644 --- a/libstdc++-v3/testsuite/30_threads/barrier/arrive_and_wait.cc +++ b/libstdc++-v3/testsuite/30_threads/barrier/arrive_and_wait.cc @@ -3,7 +3,7 @@ // { dg-require-gthreads "" } // { dg-additional-options "-pthread" { target pthread } } -// Copyright (C) 2020 Free Software Foundation, Inc. +// Copyright (C) 2020-2021 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 diff --git a/libstdc++-v3/testsuite/30_threads/barrier/completion.cc b/libstdc++-v3/testsuite/30_threads/barrier/completion.cc index ef6d2c3eac6..27be0844a60 100644 --- a/libstdc++-v3/testsuite/30_threads/barrier/completion.cc +++ b/libstdc++-v3/testsuite/30_threads/barrier/completion.cc @@ -3,7 +3,7 @@ // { dg-require-gthreads "" } // { dg-additional-options "-pthread" { target pthread } } -// Copyright (C) 2020 Free Software Foundation, Inc. +// Copyright (C) 2020-2021 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 -- 2.30.2