From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 5E3B03959E6B; Tue, 3 Aug 2021 15:34:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5E3B03959E6B MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-2703] libstdc++: Replace TR1 components with C++11 ones in test utils X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 13a1ac9f6f700f4e214fcc83b122a4a405c6b13d X-Git-Newrev: 5c6759e41607f9edbbe25be18bd322d6a0408238 Message-Id: <20210803153412.5E3B03959E6B@sourceware.org> Date: Tue, 3 Aug 2021 15:34:12 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Aug 2021 15:34:12 -0000 https://gcc.gnu.org/g:5c6759e41607f9edbbe25be18bd322d6a0408238 commit r12-2703-g5c6759e41607f9edbbe25be18bd322d6a0408238 Author: Jonathan Wakely Date: Tue Aug 3 15:02:50 2021 +0100 libstdc++: Replace TR1 components with C++11 ones in test utils Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * testsuite/util/testsuite_common_types.h: Replace uses of tr1::unordered_map and tr1::unordered_set with their C++11 equivalents. * testsuite/29_atomics/atomic/cons/assign_neg.cc: Adjust dg-error line number. * testsuite/29_atomics/atomic/cons/copy_neg.cc: Likewise. * testsuite/29_atomics/atomic_integral/cons/assign_neg.cc: Likewise. * testsuite/29_atomics/atomic_integral/cons/copy_neg.cc: Likewise. * testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc: Likewise. * testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc: Likewise. * testsuite/29_atomics/atomic_integral/operators/increment_neg.cc: Likewise. Diff: --- .../testsuite/29_atomics/atomic/cons/assign_neg.cc | 2 +- .../testsuite/29_atomics/atomic/cons/copy_neg.cc | 2 +- .../29_atomics/atomic_integral/cons/assign_neg.cc | 2 +- .../29_atomics/atomic_integral/cons/copy_neg.cc | 2 +- .../atomic_integral/operators/bitwise_neg.cc | 6 +++--- .../atomic_integral/operators/decrement_neg.cc | 6 +++--- .../atomic_integral/operators/increment_neg.cc | 6 +++--- libstdc++-v3/testsuite/util/testsuite_common_types.h | 18 +++++++++++------- 8 files changed, 24 insertions(+), 20 deletions(-) diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc index 4907312b547..f0520af8e0d 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc @@ -27,5 +27,5 @@ int main() return 0; } -// { dg-error "deleted" "" { target *-*-* } 659 } +// { dg-error "deleted" "" { target *-*-* } 663 } // { dg-prune-output "include" } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc index 0b67f61dd14..76bb2d60350 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc @@ -27,5 +27,5 @@ int main() return 0; } -// { dg-error "deleted" "" { target *-*-* } 698 } +// { dg-error "deleted" "" { target *-*-* } 702 } // { dg-prune-output "include" } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc index c54a51e4cab..8def1559bd4 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc @@ -28,5 +28,5 @@ int main() return 0; } -// { dg-error "deleted" "" { target *-*-* } 659 } +// { dg-error "deleted" "" { target *-*-* } 663 } // { dg-prune-output "include" } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc index c7d01ee31d8..9ef033bd678 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc @@ -28,5 +28,5 @@ int main() return 0; } -// { dg-error "deleted" "" { target *-*-* } 698 } +// { dg-error "deleted" "" { target *-*-* } 702 } // { dg-prune-output "include" } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc index f6749fdd97b..69c307bebae 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc @@ -26,8 +26,8 @@ int main() return 0; } -// { dg-error "operator" "" { target *-*-* } 495 } -// { dg-error "operator" "" { target *-*-* } 496 } -// { dg-error "operator" "" { target *-*-* } 497 } +// { dg-error "operator" "" { target *-*-* } 499 } +// { dg-error "operator" "" { target *-*-* } 500 } +// { dg-error "operator" "" { target *-*-* } 501 } // { dg-prune-output "declared here" } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc index 765e3af270e..31ce7d0d149 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc @@ -27,6 +27,6 @@ int main() return 0; } -// { dg-error "operator" "" { target *-*-* } 447 } -// { dg-error "operator" "" { target *-*-* } 448 } -// { dg-error "operator" "" { target *-*-* } 449 } +// { dg-error "operator" "" { target *-*-* } 451 } +// { dg-error "operator" "" { target *-*-* } 452 } +// { dg-error "operator" "" { target *-*-* } 453 } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/increment_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/increment_neg.cc index 55c331deb59..7df8ff7ecfb 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/increment_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/increment_neg.cc @@ -27,6 +27,6 @@ int main() return 0; } -// { dg-error "operator" "" { target *-*-* } 425 } -// { dg-error "operator" "" { target *-*-* } 426 } -// { dg-error "operator" "" { target *-*-* } 427 } +// { dg-error "operator" "" { target *-*-* } 429 } +// { dg-error "operator" "" { target *-*-* } 430 } +// { dg-error "operator" "" { target *-*-* } 431 } diff --git a/libstdc++-v3/testsuite/util/testsuite_common_types.h b/libstdc++-v3/testsuite/util/testsuite_common_types.h index a9a44df9664..9a3152b3a84 100644 --- a/libstdc++-v3/testsuite/util/testsuite_common_types.h +++ b/libstdc++-v3/testsuite/util/testsuite_common_types.h @@ -40,13 +40,17 @@ #include #include -#include -#include -#include #if __cplusplus >= 201103L #include #include +#include +#include +namespace unord = std; +#else +#include +#include +namespace unord = std::tr1; #endif namespace __gnu_test @@ -185,14 +189,14 @@ namespace __gnu_test typedef Tp value_type; typedef Tp key_type; typedef std::pair pair_type; - typedef std::tr1::hash hash_function; + typedef unord::hash hash_function; typedef std::equal_to equality_function; template struct container { typedef Tl allocator_type; - typedef std::tr1::unordered_map type; + typedef unord::unordered_map type; }; typedef allocator_policies allocator_types; @@ -224,14 +228,14 @@ namespace __gnu_test { typedef Tp value_type; typedef Tp key_type; - typedef std::tr1::hash hash_function; + typedef unord::hash hash_function; typedef std::equal_to equality_function; template struct container { typedef Tl allocator_type; - typedef std::tr1::unordered_set type; + typedef unord::unordered_set type; }; typedef allocator_policies allocator_types;