diff options
author | Josh Haberman <jhaberman@gmail.com> | 2015-06-03 14:52:46 -0700 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2015-06-03 14:52:46 -0700 |
commit | e5bcdc2a3fdc0c38bf09a596efd951d5aaab1148 (patch) | |
tree | 3cbc06765d77bba866efc7623c044491b48f31af /tests/pb/test_decoder.cc | |
parent | 6f30032183ccd20d7a7f031ebc9350f54179bba8 (diff) | |
parent | 97eeb570225bb2f1060f4eff18ba664e129767d2 (diff) |
Merge branch 'master' into google-internal
Diffstat (limited to 'tests/pb/test_decoder.cc')
-rw-r--r-- | tests/pb/test_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/pb/test_decoder.cc b/tests/pb/test_decoder.cc index 98926a6..c615a3c 100644 --- a/tests/pb/test_decoder.cc +++ b/tests/pb/test_decoder.cc @@ -111,7 +111,7 @@ using std::string; void vappendf(string* str, const char *format, va_list args) { va_list copy; - va_copy(copy, args); + __va_copy(copy, args); int count = vsnprintf(NULL, 0, format, args); if (count >= 0) @@ -577,7 +577,7 @@ void run_decoder(const string& proto, const string* expected_output) { fprintf(stderr, "RUNNING TEST CASE, hash=%x\n", testhash); fprintf(stderr, "JIT on: %s\n", global_method->is_native() ? "true" : "false"); - fprintf(stderr, "Input (len=%zu): ", proto.size()); + fprintf(stderr, "Input (len=%u): ", (unsigned)proto.size()); PrintBinary(proto); fprintf(stderr, "\n"); if (expected_output) { |