From 52a708fbcaf4d84412e502b0cbe504f86a361f01 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Fri, 23 May 2014 15:30:23 +0000 Subject: [PATCH] Fix bug 19840, where some tests were not testing what we wanted. Thanks to Eric for the bug report git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@209520 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../lexicographical_compare.pass.cpp | 12 ++++++------ .../lexicographical_compare_comp.pass.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp index 3fa8b2c6..71dfeefe 100644 --- a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp +++ b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp @@ -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() diff --git a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp index f5f1c07f..c1851560 100644 --- a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp @@ -31,12 +31,12 @@ test() int ib[] = {1, 2, 3}; typedef std::greater 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()