diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2014-11-17 19:16:57 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2014-11-17 19:16:57 +0000 |
| commit | e2c1750a2fbb1d85744a44862b862bebc1c7829c (patch) | |
| tree | 15ff2e5748a8cf7776e8b8cdec61cc96762d685d /libcxx/test/algorithms | |
| parent | 6164753e81c574589822b246b89099dbe9439710 (diff) | |
| download | bcm5719-llvm-e2c1750a2fbb1d85744a44862b862bebc1c7829c.tar.gz bcm5719-llvm-e2c1750a2fbb1d85744a44862b862bebc1c7829c.zip | |
Fix the tests I broke with the last commit. Sorry for the noise
llvm-svn: 222165
Diffstat (limited to 'libcxx/test/algorithms')
| -rw-r--r-- | libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp | 4 | ||||
| -rw-r--r-- | libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp index 2f424f41669..0cf06bbfba7 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, II>(II(ia+3), II(ib+3)))); - assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), II(ib+sb)) - == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))))); + assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), RAI(ib+sb)) + == (std::pair<RAI, RAI>(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 8bf34009f08..ce0326c660f 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, 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)))); assert(bcp.count() > 0 && bcp.count() < std::min(sa, sb)); #endif |
