[libcxx] r209520 - Fix bug 19840, where some tests were not testing what we wanted. Thanks to Eric for the bug report

[Marshall Clow]

Author: marshall
Date: Fri May 23 10:30:23 2014
New Revision: 209520

URL: http://llvm.org/viewvc/llvm-project?rev=209520&view=rev
Log:
Fix bug 19840, where some tests were not testing what we wanted. Thanks to Eric for the bug report

Modified:
    libcxx/trunk/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
    libcxx/trunk/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp

Modified: libcxx/trunk/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp?rev=209520&r1=209519&r2=209520&view=diff
==============================================================================
--- libcxx/trunk/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp (original)
+++ libcxx/trunk/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp Fri May 23 10:30:23 2014
@@ -27,12 +27,12 @@ test()
     int ia[] = {1, 2, 3, 4};
     const unsigned sa = sizeof(ia)/sizeof(ia[0]);
     int ib[] = {1, 2, 3};
-    assert(!std::lexicographical_compare(ia, ia+sa, ib, ib+2));
-    assert(std::lexicographical_compare(ib, ib+2, ia, ia+sa));
-    assert(!std::lexicographical_compare(ia, ia+sa, ib, ib+3));
-    assert(std::lexicographical_compare(ib, ib+3, ia, ia+sa));
-    assert(std::lexicographical_compare(ia, ia+sa, ib+1, ib+3));
-    assert(!std::lexicographical_compare(ib+1, ib+3, ia, ia+sa));
+    assert(!std::lexicographical_compare(Iter1(ia),   Iter1(ia+sa), Iter2(ib),   Iter2(ib+2)));
+    assert( std::lexicographical_compare(Iter1(ib),   Iter1(ib+2),  Iter2(ia),   Iter2(ia+sa)));
+    assert(!std::lexicographical_compare(Iter1(ia),   Iter1(ia+sa), Iter2(ib),   Iter2(ib+3)));
+    assert( std::lexicographical_compare(Iter1(ib),   Iter1(ib+3),  Iter2(ia),   Iter2(ia+sa)));
+    assert( std::lexicographical_compare(Iter1(ia),   Iter1(ia+sa), Iter2(ib+1), Iter2(ib+3)));
+    assert(!std::lexicographical_compare(Iter1(ib+1), Iter1(ib+3),  Iter2(ia),   Iter2(ia+sa)));
 }
 
 int main()

Modified: libcxx/trunk/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp?rev=209520&r1=209519&r2=209520&view=diff
==============================================================================
--- libcxx/trunk/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp (original)
+++ libcxx/trunk/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp Fri May 23 10:30:23 2014
@@ -31,12 +31,12 @@ test()
     int ib[] = {1, 2, 3};
     typedef std::greater<int> C;
     C c;
-    assert(!std::lexicographical_compare(ia, ia+sa, ib, ib+2, c));
-    assert(std::lexicographical_compare(ib, ib+2, ia, ia+sa, c));
-    assert(!std::lexicographical_compare(ia, ia+sa, ib, ib+3, c));
-    assert(std::lexicographical_compare(ib, ib+3, ia, ia+sa, c));
-    assert(!std::lexicographical_compare(ia, ia+sa, ib+1, ib+3, c));
-    assert(std::lexicographical_compare(ib+1, ib+3, ia, ia+sa, c));
+    assert(!std::lexicographical_compare(Iter1(ia),   Iter1(ia+sa), Iter2(ib),   Iter2(ib+2),  c));
+    assert( std::lexicographical_compare(Iter1(ib),   Iter1(ib+2),  Iter2(ia),   Iter2(ia+sa), c));
+    assert(!std::lexicographical_compare(Iter1(ia),   Iter1(ia+sa), Iter2(ib),   Iter2(ib+3),  c));
+    assert( std::lexicographical_compare(Iter1(ib),   Iter1(ib+3),  Iter2(ia),   Iter2(ia+sa), c));
+    assert(!std::lexicographical_compare(Iter1(ia),   Iter1(ia+sa), Iter2(ib+1), Iter2(ib+3),  c));
+    assert( std::lexicographical_compare(Iter1(ib+1), Iter1(ib+3),  Iter2(ia),   Iter2(ia+sa), c));
 }
 
 int main()