diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2014-05-23 15:30:23 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2014-05-23 15:30:23 +0000 |
| commit | af236d36fb45e8b8f30f3e6ef14a8cb352953e72 (patch) | |
| tree | 25c23f714d735b352dbd9f1b353d0f5bdff8e581 /libcxx | |
| parent | 6314ad41d1601cefd632432a1e3840fc2b2c636f (diff) | |
| download | llvm-af236d36fb45e8b8f30f3e6ef14a8cb352953e72.zip llvm-af236d36fb45e8b8f30f3e6ef14a8cb352953e72.tar.gz llvm-af236d36fb45e8b8f30f3e6ef14a8cb352953e72.tar.bz2 | |
Fix bug 19840, where some tests were not testing what we wanted. Thanks to Eric for the bug report
llvm-svn: 209520
Diffstat (limited to 'libcxx')
2 files changed, 12 insertions, 12 deletions
diff --git a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp index 3fa8b2c..71dfeef 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp index f5f1c07..c185156 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp +++ b/libcxx/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<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() |