diff options
author | Marshall Clow <mclow.lists@gmail.com> | 2014-03-10 18:54:56 +0000 |
---|---|---|
committer | Marshall Clow <mclow.lists@gmail.com> | 2014-03-10 18:54:56 +0000 |
commit | 9863083ee04fe80e227976bc90dbc01806bdf3d9 (patch) | |
tree | 73598a08ec24fe5a7ac7a748da42549b7ea188ab | |
parent | f7b63d646b17711fa74ce97fc05d02055c63523d (diff) | |
download | libcxx_35a-9863083ee04fe80e227976bc90dbc01806bdf3d9.tar.gz |
Added tests to the sequence containers for for LWG Issue #2263. Comparing iterators and allocator pointers with different const-character. No changes to libc++
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@203479 91177308-0d34-0410-b5e6-96231b3b80d8
6 files changed, 78 insertions, 18 deletions
diff --git a/test/containers/sequences/array/iterators.pass.cpp b/test/containers/sequences/array/iterators.pass.cpp index 3014fd54..98997d8c 100644 --- a/test/containers/sequences/array/iterators.pass.cpp +++ b/test/containers/sequences/array/iterators.pass.cpp @@ -72,10 +72,23 @@ int main() C::const_iterator cii{}; assert ( ii1 == ii2 ); assert ( ii1 == ii4 ); - assert ( ii1 == cii ); - assert ( !(ii1 != ii2 )); - assert ( !(ii1 != cii )); + assert (!(ii1 != ii2 )); + + assert ( (ii1 == cii )); + assert ( (cii == ii1 )); + assert (!(ii1 != cii )); + assert (!(cii != ii1 )); + assert (!(ii1 < cii )); + assert (!(cii < ii1 )); + assert ( (ii1 <= cii )); + assert ( (cii <= ii1 )); + assert (!(ii1 > cii )); + assert (!(cii > ii1 )); + assert ( (ii1 >= cii )); + assert ( (cii >= ii1 )); + assert (cii - ii1 == 0); + assert (ii1 - cii == 0); C c; assert ( c.begin() == std::begin(c)); diff --git a/test/containers/sequences/deque/iterators.pass.cpp b/test/containers/sequences/deque/iterators.pass.cpp index 9140e02b..8ec491fa 100644 --- a/test/containers/sequences/deque/iterators.pass.cpp +++ b/test/containers/sequences/deque/iterators.pass.cpp @@ -51,11 +51,24 @@ int main() std::deque<int>::const_iterator cii{}; assert ( ii1 == ii2 ); assert ( ii1 == ii4 ); - assert ( ii1 == cii ); - assert ( !(ii1 != ii2 )); - assert ( !(ii1 != cii )); + assert (!(ii1 != ii2 )); + assert ( (ii1 == cii )); + assert ( (cii == ii1 )); + assert (!(ii1 != cii )); + assert (!(cii != ii1 )); + assert (!(ii1 < cii )); + assert (!(cii < ii1 )); + assert ( (ii1 <= cii )); + assert ( (cii <= ii1 )); + assert (!(ii1 > cii )); + assert (!(cii > ii1 )); + assert ( (ii1 >= cii )); + assert ( (cii >= ii1 )); + assert (cii - ii1 == 0); + assert (ii1 - cii == 0); + // std::deque<int> c; // assert ( ii1 != c.cbegin()); // assert ( cii != c.begin()); diff --git a/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp index 02e17d72..6f3ac548 100644 --- a/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp +++ b/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp @@ -127,10 +127,13 @@ int main() std::forward_list<int>::const_iterator cii{}; assert ( ii1 == ii2 ); assert ( ii1 == ii4 ); - assert ( ii1 == cii ); + + assert (!(ii1 != ii2 )); - assert ( !(ii1 != ii2 )); - assert ( !(ii1 != cii )); + assert ( (ii1 == cii )); + assert ( (cii == ii1 )); + assert (!(ii1 != cii )); + assert (!(cii != ii1 )); // std::forward_list<int> c; // assert ( ii1 != c.cbegin()); diff --git a/test/containers/sequences/list/iterators.pass.cpp b/test/containers/sequences/list/iterators.pass.cpp index a843334e..a33ee3ec 100644 --- a/test/containers/sequences/list/iterators.pass.cpp +++ b/test/containers/sequences/list/iterators.pass.cpp @@ -143,10 +143,13 @@ int main() std::list<int>::const_iterator cii{}; assert ( ii1 == ii2 ); assert ( ii1 == ii4 ); - assert ( ii1 == cii ); - assert ( !(ii1 != ii2 )); - assert ( !(ii1 != cii )); + assert (!(ii1 != ii2 )); + + assert ( (ii1 == cii )); + assert ( (cii == ii1 )); + assert (!(ii1 != cii )); + assert (!(cii != ii1 )); assert ( ii1 != c.cbegin()); assert ( cii != c.begin()); diff --git a/test/containers/sequences/vector.bool/iterators.pass.cpp b/test/containers/sequences/vector.bool/iterators.pass.cpp index b63f6a60..c54fa4a8 100644 --- a/test/containers/sequences/vector.bool/iterators.pass.cpp +++ b/test/containers/sequences/vector.bool/iterators.pass.cpp @@ -101,9 +101,23 @@ int main() std::vector<bool>::const_iterator cii{}; assert ( ii1 == ii2 ); assert ( ii1 == ii4 ); - assert ( ii1 == cii ); - assert ( !(ii1 != ii2 )); - assert ( !(ii1 != cii )); + + assert (!(ii1 != ii2 )); + + assert ( (ii1 == cii )); + assert ( (cii == ii1 )); + assert (!(ii1 != cii )); + assert (!(cii != ii1 )); + assert (!(ii1 < cii )); + assert (!(cii < ii1 )); + assert ( (ii1 <= cii )); + assert ( (cii <= ii1 )); + assert (!(ii1 > cii )); + assert (!(cii > ii1 )); + assert ( (ii1 >= cii )); + assert ( (cii >= ii1 )); + assert (cii - ii1 == 0); + assert (ii1 - cii == 0); } #endif } diff --git a/test/containers/sequences/vector/iterators.pass.cpp b/test/containers/sequences/vector/iterators.pass.cpp index 82de6654..75a08287 100644 --- a/test/containers/sequences/vector/iterators.pass.cpp +++ b/test/containers/sequences/vector/iterators.pass.cpp @@ -143,9 +143,23 @@ int main() C::const_iterator cii{}; assert ( ii1 == ii2 ); assert ( ii1 == ii4 ); - assert ( ii1 == cii ); - assert ( !(ii1 != ii2 )); - assert ( !(ii1 != cii )); + + assert (!(ii1 != ii2 )); + + assert ( (ii1 == cii )); + assert ( (cii == ii1 )); + assert (!(ii1 != cii )); + assert (!(cii != ii1 )); + assert (!(ii1 < cii )); + assert (!(cii < ii1 )); + assert ( (ii1 <= cii )); + assert ( (cii <= ii1 )); + assert (!(ii1 > cii )); + assert (!(cii > ii1 )); + assert ( (ii1 >= cii )); + assert ( (cii >= ii1 )); + assert (cii - ii1 == 0); + assert (ii1 - cii == 0); } #endif } |