From: Marshall Clow Date: Mon, 17 Nov 2014 19:16:57 +0000 (+0000) Subject: Fix the tests I broke with the last commit. Sorry for the noise X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2c1750a2fbb1d85744a44862b862bebc1c7829c;p=platform%2Fupstream%2Fllvm.git Fix the tests I broke with the last commit. Sorry for the noise llvm-svn: 222165 --- diff --git a/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp index 2f424f4..0cf06bb 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp +++ b/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp @@ -43,8 +43,8 @@ int main() assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib+sb)) == (std::pair(II(ia+3), II(ib+3)))); - assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), II(ib+sb)) - == (std::pair(RAI(ia+3), RAI(ib+3))))); + assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), RAI(ib+sb)) + == (std::pair(RAI(ia+3), RAI(ib+3)))); assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib+2)) diff --git a/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp index 8bf3400..ce0326c 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp +++ b/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp @@ -26,7 +26,6 @@ #define HAS_FOUR_ITERATOR_VERSION #endif - int main() { 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()) == (std::pair(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(ia+3), II(ib+3)))); assert(bcp.count() > 0 && bcp.count() < std::min(sa, sb)); #endif