OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Qualify functions used in tests

Browse Source 
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.
This commit is contained in:
Jonathan Wakely 2021-05-24 18:42:09 +01:00
parent 0e3b3b77e1
commit 6fdc59f196
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libstdc++-v3/testsuite/25_algorithms/inplace_merge/constrained.cc
View File

@ -41,7 +41,7 @@ test01()
ranges::sort(v); ranges::sort(v);
test_range<int, bidirectional_iterator_wrapper> rz(v.data(), v.data()+i+j); test_range<int, bidirectional_iterator_wrapper> 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( result == rz.end() );
VERIFY( ranges::is_sorted(rz) ); VERIFY( ranges::is_sorted(rz) );

2
libstdc++-v3/testsuite/25_algorithms/is_sorted/constrained.cc
View File

@ -46,7 +46,7 @@ test02()
test_range<int, forward_iterator_wrapper> rx(x); test_range<int, forward_iterator_wrapper> rx(x);
VERIFY( ranges::is_sorted(rx) ); VERIFY( ranges::is_sorted(rx) );
VERIFY( !ranges::is_sorted(ranges::begin(rx), VERIFY( !ranges::is_sorted(ranges::begin(rx),
next(ranges::begin(rx), 2), ranges::next(ranges::begin(rx), 2),
ranges::greater{}) ); ranges::greater{}) );
} }

4
libstdc++-v3/testsuite/25_algorithms/is_sorted_until/constrained.cc
View File

@ -50,9 +50,9 @@ test02()
test_range<int, forward_iterator_wrapper> rx(x); test_range<int, forward_iterator_wrapper> rx(x);
VERIFY( ranges::is_sorted_until(rx) == ranges::end(rx) ); VERIFY( ranges::is_sorted_until(rx) == ranges::end(rx) );
VERIFY( ranges::is_sorted_until(ranges::begin(rx), VERIFY( ranges::is_sorted_until(ranges::begin(rx),
next(ranges::begin(rx), 2), ranges::next(ranges::begin(rx), 2),
ranges::greater{}) ranges::greater{})
== next(ranges::begin(rx), 1) ); == ranges::next(ranges::begin(rx), 1) );
} }
constexpr bool constexpr bool

6
libstdc++-v3/testsuite/25_algorithms/swap_ranges/1.cc
View File

@ -24,7 +24,7 @@
using __gnu_test::test_container; using __gnu_test::test_container;
using __gnu_test::forward_iterator_wrapper; using __gnu_test::forward_iterator_wrapper;
typedef test_container<int, forward_iterator_wrapper> Container; typedef test_container<int, forward_iterator_wrapper> Container;
void void
@ -46,10 +46,10 @@ test2()
int array2[] = {1}; int array2[] = {1};
Container con1(array1, array1); Container con1(array1, array1);
Container con2(array2, array2); 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() main()
{ {
test1(); test1();