generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@209520 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2014-05-23 15:30:23 +00:00
parent 6b7e6921e2
commit 52a708fbca
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
View File

@@ -27,12 +27,12 @@ test()
int ia[] = {1, 2, 3, 4}; int ia[] = {1, 2, 3, 4};
const unsigned sa = sizeof(ia)/sizeof(ia[0]); const unsigned sa = sizeof(ia)/sizeof(ia[0]);
int ib[] = {1, 2, 3}; int ib[] = {1, 2, 3};
assert(!std::lexicographical_compare(ia, ia+sa, ib, ib+2)); assert(!std::lexicographical_compare(Iter1(ia), Iter1(ia+sa), Iter2(ib), Iter2(ib+2)));
assert(std::lexicographical_compare(ib, ib+2, ia, ia+sa)); assert( std::lexicographical_compare(Iter1(ib), Iter1(ib+2), Iter2(ia), Iter2(ia+sa)));
assert(!std::lexicographical_compare(ia, ia+sa, ib, ib+3)); assert(!std::lexicographical_compare(Iter1(ia), Iter1(ia+sa), Iter2(ib), Iter2(ib+3)));
assert(std::lexicographical_compare(ib, ib+3, ia, ia+sa)); assert( std::lexicographical_compare(Iter1(ib), Iter1(ib+3), Iter2(ia), Iter2(ia+sa)));
assert(std::lexicographical_compare(ia, ia+sa, ib+1, ib+3)); assert( std::lexicographical_compare(Iter1(ia), Iter1(ia+sa), Iter2(ib+1), Iter2(ib+3)));
assert(!std::lexicographical_compare(ib+1, ib+3, ia, ia+sa)); assert(!std::lexicographical_compare(Iter1(ib+1), Iter1(ib+3), Iter2(ia), Iter2(ia+sa)));
} }
int main() int main()

12
test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
View File

@@ -31,12 +31,12 @@ test()
int ib[] = {1, 2, 3}; int ib[] = {1, 2, 3};
typedef std::greater<int> C; typedef std::greater<int> C;
C c; C c;
assert(!std::lexicographical_compare(ia, ia+sa, ib, ib+2, c)); assert(!std::lexicographical_compare(Iter1(ia), Iter1(ia+sa), Iter2(ib), Iter2(ib+2), c));
assert(std::lexicographical_compare(ib, ib+2, ia, ia+sa, c)); assert( std::lexicographical_compare(Iter1(ib), Iter1(ib+2), Iter2(ia), Iter2(ia+sa), c));
assert(!std::lexicographical_compare(ia, ia+sa, ib, ib+3, c)); assert(!std::lexicographical_compare(Iter1(ia), Iter1(ia+sa), Iter2(ib), Iter2(ib+3), c));
assert(std::lexicographical_compare(ib, ib+3, ia, ia+sa, c)); assert( std::lexicographical_compare(Iter1(ib), Iter1(ib+3), Iter2(ia), Iter2(ia+sa), c));
assert(!std::lexicographical_compare(ia, ia+sa, ib+1, ib+3, c)); assert(!std::lexicographical_compare(Iter1(ia), Iter1(ia+sa), Iter2(ib+1), Iter2(ib+3), c));
assert(std::lexicographical_compare(ib+1, ib+3, ia, ia+sa, c)); assert( std::lexicographical_compare(Iter1(ib+1), Iter1(ib+3), Iter2(ia), Iter2(ia+sa), c));
} }
int main() int main()