[libcxx] r222165 - Fix the tests I broke with the last commit. Sorry for the noise
Marshall Clow
mclow.lists at gmail.com
Mon Nov 17 11:16:58 PST 2014
Author: marshall
Date: Mon Nov 17 13:16:57 2014
New Revision: 222165
URL: http://llvm.org/viewvc/llvm-project?rev=222165&view=rev
Log:
Fix the tests I broke with the last commit. Sorry for the noise
Modified:
libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
Modified: libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp?rev=222165&r1=222164&r2=222165&view=diff
==============================================================================
--- libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp (original)
+++ libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp Mon Nov 17 13:16:57 2014
@@ -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))
Modified: libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp?rev=222165&r1=222164&r2=222165&view=diff
==============================================================================
--- libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp (original)
+++ libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp Mon Nov 17 13:16:57 2014
@@ -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
More information about the cfe-commits
mailing list