Author: marshall
Date: Mon Aug 28 18:10:51 2017
New Revision: 311967
URL: http://llvm.org/viewvc/llvm-project?rev=311967&view=rev
Log:
Fix test for C++03
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp?rev=311967&r1=311966&r2=311967&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
Mon Aug 28 18:10:51 2017
@@ -127,11 +127,12 @@ void test_PR31166 ()
{
typedef std::pair<int, int> P;
typedef std::vector<P> V;
- const V vec {{1, 0}, {2, 0}, {2, 1}, {2, 2}, {2, 3}};
+ P vec[5] = {P(1, 0), P(2, 0), P(2, 1), P(2, 2), P(2, 3)};
for ( int i = 0; i < 5; ++i ) {
- V res = vec;
+ V res(vec, vec + 5);
std::inplace_merge(res.begin(), res.begin() + i, res.end(),
less_by_first());
- assert(res == vec);
+ assert(res.size() == 5);
+ assert(std::equal(res.begin(), res.end(), vec));
}
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
