From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id E4157385DC33; Mon, 24 May 2021 18:53:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E4157385DC33 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-1017] libstdc++: Qualify functions used in tests X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 0e3b3b77e13cac764a135a7118613c47686e0a62 X-Git-Newrev: 6fdc59f196c3e1b4aeeb8a0407d4eb40645c5251 Message-Id: <20210524185329.E4157385DC33@sourceware.org> Date: Mon, 24 May 2021 18:53:29 +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: Mon, 24 May 2021 18:53:30 -0000 https://gcc.gnu.org/g:6fdc59f196c3e1b4aeeb8a0407d4eb40645c5251 commit r12-1017-g6fdc59f196c3e1b4aeeb8a0407d4eb40645c5251 Author: Jonathan Wakely Date: Mon May 24 18:42:09 2021 +0100 libstdc++: Qualify functions used in tests These tests rely on ADL for some functions, probably unintentionally. The calls only work because the iterator wrappers derive from std::iterator and so namespace std is an associated namespace. libstdc++-v3/ChangeLog: * testsuite/25_algorithms/inplace_merge/constrained.cc: Qualify call to ranges::next. * testsuite/25_algorithms/is_sorted/constrained.cc: Likewise. * testsuite/25_algorithms/is_sorted_until/constrained.cc: Likewise. * testsuite/25_algorithms/swap_ranges/1.cc: Qualify call to swap_ranges. Diff: --- libstdc++-v3/testsuite/25_algorithms/inplace_merge/constrained.cc | 2 +- libstdc++-v3/testsuite/25_algorithms/is_sorted/constrained.cc | 2 +- libstdc++-v3/testsuite/25_algorithms/is_sorted_until/constrained.cc | 4 ++-- libstdc++-v3/testsuite/25_algorithms/swap_ranges/1.cc | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/constrained.cc index e1f59bf86b5..2f3d5d6955a 100644 --- a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/constrained.cc @@ -41,7 +41,7 @@ test01() ranges::sort(v); test_range rz(v.data(), v.data()+i+j); - auto result = ranges::inplace_merge(rz, next(ranges::begin(rz), i)); + auto result = ranges::inplace_merge(rz, ranges::next(ranges::begin(rz), i)); VERIFY( result == rz.end() ); VERIFY( ranges::is_sorted(rz) ); diff --git a/libstdc++-v3/testsuite/25_algorithms/is_sorted/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/is_sorted/constrained.cc index c3764846090..92440bb7bd7 100644 --- a/libstdc++-v3/testsuite/25_algorithms/is_sorted/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/is_sorted/constrained.cc @@ -46,7 +46,7 @@ test02() test_range rx(x); VERIFY( ranges::is_sorted(rx) ); VERIFY( !ranges::is_sorted(ranges::begin(rx), - next(ranges::begin(rx), 2), + ranges::next(ranges::begin(rx), 2), ranges::greater{}) ); } diff --git a/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/constrained.cc index 9d23ebc81fe..bc323348313 100644 --- a/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/constrained.cc @@ -50,9 +50,9 @@ test02() test_range rx(x); VERIFY( ranges::is_sorted_until(rx) == ranges::end(rx) ); VERIFY( ranges::is_sorted_until(ranges::begin(rx), - next(ranges::begin(rx), 2), + ranges::next(ranges::begin(rx), 2), ranges::greater{}) - == next(ranges::begin(rx), 1) ); + == ranges::next(ranges::begin(rx), 1) ); } constexpr bool diff --git a/libstdc++-v3/testsuite/25_algorithms/swap_ranges/1.cc b/libstdc++-v3/testsuite/25_algorithms/swap_ranges/1.cc index 31eee31cd6d..4660199af50 100644 --- a/libstdc++-v3/testsuite/25_algorithms/swap_ranges/1.cc +++ b/libstdc++-v3/testsuite/25_algorithms/swap_ranges/1.cc @@ -24,7 +24,7 @@ using __gnu_test::test_container; using __gnu_test::forward_iterator_wrapper; -typedef test_container Container; +typedef test_container Container; void @@ -46,10 +46,10 @@ test2() int array2[] = {1}; Container con1(array1, array1); Container con2(array2, array2); - VERIFY(swap_ranges(con1.begin(), con1.end(), con2.begin()).ptr == array2); + VERIFY(std::swap_ranges(con1.begin(), con1.end(), con2.begin()).ptr == array2); } -int +int main() { test1();