diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2017-08-29 01:10:51 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2017-08-29 01:10:51 +0000 |
| commit | 589453458ddd21b3ed46600d88dffc1af025e85d (patch) | |
| tree | 0a9e1b48f075db31e2ba39ef3f58decfeaa0ad79 /libcxx/test/std/algorithms/alg.sorting | |
| parent | 802afb4c0aa9d2fe6b94aac95b3d1831f2eec189 (diff) | |
| download | bcm5719-llvm-589453458ddd21b3ed46600d88dffc1af025e85d.tar.gz bcm5719-llvm-589453458ddd21b3ed46600d88dffc1af025e85d.zip | |
Fix test for C++03
llvm-svn: 311967
Diffstat (limited to 'libcxx/test/std/algorithms/alg.sorting')
| -rw-r--r-- | libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp index 6fd8fd4f924..992862a4ecf 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp @@ -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)); } } |

