From 179e9455a5df659cc1d3da3251834c577e27e2a0 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 10 Mar 2014 19:18:49 +0000 Subject: [PATCH] More tests for LWG Issue #2263; this time to the associative and unordered containers. Still no changes to libc++ git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@203480 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../associative/map/map.access/iterator.pass.cpp | 9 ++++++--- test/containers/associative/multimap/iterator.pass.cpp | 9 ++++++--- test/containers/associative/multiset/iterator.pass.cpp | 9 ++++++--- test/containers/associative/set/iterator.pass.cpp | 9 ++++++--- test/containers/unord/unord.map/iterators.pass.cpp | 9 ++++++--- test/containers/unord/unord.multimap/iterators.pass.cpp | 9 ++++++--- test/containers/unord/unord.multiset/iterators.pass.cpp | 9 ++++++--- test/containers/unord/unord.set/iterators.pass.cpp | 9 ++++++--- 8 files changed, 48 insertions(+), 24 deletions(-) diff --git a/test/containers/associative/map/map.access/iterator.pass.cpp b/test/containers/associative/map/map.access/iterator.pass.cpp index 7aa713cc..552e87d8 100644 --- a/test/containers/associative/map/map.access/iterator.pass.cpp +++ b/test/containers/associative/map/map.access/iterator.pass.cpp @@ -215,10 +215,13 @@ 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 )); } #endif } diff --git a/test/containers/associative/multimap/iterator.pass.cpp b/test/containers/associative/multimap/iterator.pass.cpp index 1fdbfa1a..2763129a 100644 --- a/test/containers/associative/multimap/iterator.pass.cpp +++ b/test/containers/associative/multimap/iterator.pass.cpp @@ -219,10 +219,13 @@ 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 )); } #endif } diff --git a/test/containers/associative/multiset/iterator.pass.cpp b/test/containers/associative/multiset/iterator.pass.cpp index ccb6c666..d1f0ecfd 100644 --- a/test/containers/associative/multiset/iterator.pass.cpp +++ b/test/containers/associative/multiset/iterator.pass.cpp @@ -203,10 +203,13 @@ 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 )); } #endif } diff --git a/test/containers/associative/set/iterator.pass.cpp b/test/containers/associative/set/iterator.pass.cpp index 39c8cc67..ecd950f0 100644 --- a/test/containers/associative/set/iterator.pass.cpp +++ b/test/containers/associative/set/iterator.pass.cpp @@ -199,10 +199,13 @@ 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 )); } #endif } diff --git a/test/containers/unord/unord.map/iterators.pass.cpp b/test/containers/unord/unord.map/iterators.pass.cpp index 4ac126a5..47b1d738 100644 --- a/test/containers/unord/unord.map/iterators.pass.cpp +++ b/test/containers/unord/unord.map/iterators.pass.cpp @@ -116,10 +116,13 @@ 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 )); } #endif } diff --git a/test/containers/unord/unord.multimap/iterators.pass.cpp b/test/containers/unord/unord.multimap/iterators.pass.cpp index 8a3faa8b..1831cf11 100644 --- a/test/containers/unord/unord.multimap/iterators.pass.cpp +++ b/test/containers/unord/unord.multimap/iterators.pass.cpp @@ -122,10 +122,13 @@ 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 )); } #endif } diff --git a/test/containers/unord/unord.multiset/iterators.pass.cpp b/test/containers/unord/unord.multiset/iterators.pass.cpp index fd7077b4..be95b445 100644 --- a/test/containers/unord/unord.multiset/iterators.pass.cpp +++ b/test/containers/unord/unord.multiset/iterators.pass.cpp @@ -115,10 +115,13 @@ 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 )); } #endif } diff --git a/test/containers/unord/unord.set/iterators.pass.cpp b/test/containers/unord/unord.set/iterators.pass.cpp index d88310ec..d3a45801 100644 --- a/test/containers/unord/unord.set/iterators.pass.cpp +++ b/test/containers/unord/unord.set/iterators.pass.cpp @@ -115,10 +115,13 @@ 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 )); } #endif }