[libcxx][nfc] prefixes test type input_iterator with cpp17_
C++20 revised the definition of what it means to be an iterator. While all _Cpp17InputIterators_ satisfy `std::input_iterator`, the reverse isn't true. D100271 introduces a new test adaptor to accommodate this new definition (`cpp20_input_iterator`). In order to help readers immediately distinguish which input iterator adaptor is _Cpp17InputIterator_, the current `input_iterator` adaptor has been prefixed with `cpp17_`. Differential Revision: https://reviews.llvm.org/D101242
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "test_macros.h"
|
||||
#include "test_allocator.h"
|
||||
#include "../input_iterator.h"
|
||||
#include "../cpp17_input_iterator.h"
|
||||
#include "min_allocator.h"
|
||||
|
||||
template <class It>
|
||||
@@ -74,17 +74,17 @@ int main(int, char**)
|
||||
test(s, s+50);
|
||||
test(s, s+50, A(2));
|
||||
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s));
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s), A(2));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), A(2));
|
||||
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+1));
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+1), A(2));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), A(2));
|
||||
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+10));
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+10), A(2));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), A(2));
|
||||
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+50));
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+50), A(2));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+50));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+50), A(2));
|
||||
}
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
@@ -103,17 +103,17 @@ int main(int, char**)
|
||||
test(s, s+50);
|
||||
test(s, s+50, A());
|
||||
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s));
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s), A());
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), A());
|
||||
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+1));
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+1), A());
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), A());
|
||||
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+10));
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+10), A());
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), A());
|
||||
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+50));
|
||||
test(input_iterator<const char*>(s), input_iterator<const char*>(s+50), A());
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+50));
|
||||
test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+50), A());
|
||||
}
|
||||
#endif
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user