diff options
author | Stephan T. Lavavej <stl@exchange.microsoft.com> | 2016-12-06 01:12:34 +0000 |
---|---|---|
committer | Stephan T. Lavavej <stl@exchange.microsoft.com> | 2016-12-06 01:12:34 +0000 |
commit | fbfb2ab63e94f1b0c248cd810ae3fb35889d99b6 (patch) | |
tree | 67ea304c455aa91bacfbd7b4be06824ff157ce3c /libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp | |
parent | ad55ee58691b58f3ac36e688fc90808d5cf71e7f (diff) | |
download | bcm5719-llvm-fbfb2ab63e94f1b0c248cd810ae3fb35889d99b6.tar.gz bcm5719-llvm-fbfb2ab63e94f1b0c248cd810ae3fb35889d99b6.zip |
[libcxx] [test] D27021: Fix MSVC warning C4389 "signed/unsigned mismatch", part 8/12.
Add static_cast<std::size_t> when comparing distance() to size().
These replacements were performed programmatically with regex_replace():
const vector<pair<regex, string>> reg_fmt = {
{ regex(R"(assert\((\w+)\.size\(\) == std::distance\((\w+, \w+)\)\))"),
"assert($1.size() == static_cast<std::size_t>(std::distance($2)))" },
{ regex(R"(assert\(distance\((\w+\.begin\(\), \w+\.end\(\))\) == (\w+)\.size\(\)\))"),
"assert(static_cast<std::size_t>(distance($1)) == $2.size())" },
{ regex(R"(assert\(std::distance\((\w+\.\w*begin\(\), \w+\.\w*end\(\))\) == (\w+)\.size\(\)\))"),
"assert(static_cast<std::size_t>(std::distance($1)) == $2.size())" },
};
Also, include <cstddef> when it wasn't already being included.
llvm-svn: 288745
Diffstat (limited to 'libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp')
-rw-r--r-- | libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp index 232486778b7..e0c2d0129ef 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp @@ -49,7 +49,7 @@ test(int P, C& c1, int x) CI i = c1.insert(c1.begin() + P, x); assert(i == c1.begin() + P); assert(c1.size() == c1_osize + 1); - assert(distance(c1.begin(), c1.end()) == c1.size()); + assert(static_cast<std::size_t>(distance(c1.begin(), c1.end())) == c1.size()); i = c1.begin(); for (int j = 0; j < P; ++j, ++i) assert(*i == j); @@ -103,7 +103,7 @@ self_reference_test() CI jt = c.cbegin() + j; c.insert(it, *jt); assert(c.size() == 21); - assert(distance(c.begin(), c.end()) == c.size()); + assert(static_cast<std::size_t>(distance(c.begin(), c.end())) == c.size()); it = c.cbegin(); for (int k = 0; k < i; ++k, ++it) assert(*it == k); |