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

Fix the tests I broke with the last commit. Sorry for the noise

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@222165 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2014-11-17 19:16:57 +00:00
parent 4b3ca8c249
commit 48b428d540
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
View File

@ -43,8 +43,8 @@ int main()
assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib+sb)) assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib+sb))
== (std::pair<II, II>(II(ia+3), II(ib+3)))); == (std::pair<II, II>(II(ia+3), II(ib+3))));
assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), II(ib+sb)) assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), RAI(ib+sb))
== (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))))); == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))));
assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib+2)) assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib+2))

3
test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
View File

@ -26,7 +26,6 @@
#define HAS_FOUR_ITERATOR_VERSION #define HAS_FOUR_ITERATOR_VERSION
#endif #endif
int main() int main()
{ {
int ia[] = {0, 1, 2, 2, 0, 1, 2, 3}; int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
@ -55,7 +54,7 @@ int main()
assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), RAI(ib + sb), EQ()) assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), RAI(ib + sb), EQ())
== (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3)))); == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))));
assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib + sa), bcp) assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib + sb), std::ref(bcp))
== (std::pair<II, II>(II(ia+3), II(ib+3)))); == (std::pair<II, II>(II(ia+3), II(ib+3))));
assert(bcp.count() > 0 && bcp.count() < std::min(sa, sb)); assert(bcp.count() > 0 && bcp.count() < std::min(sa, sb));
#endif #endif