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/bindings/googlepb | |
| parent | 6f30032183ccd20d7a7f031ebc9350f54179bba8 (diff) | |
| parent | 97eeb570225bb2f1060f4eff18ba664e129767d2 (diff) | |
Merge branch 'master' into google-internal
Diffstat (limited to 'tests/bindings/googlepb')
| -rw-r--r-- | tests/bindings/googlepb/test_vs_proto2.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/bindings/googlepb/test_vs_proto2.cc b/tests/bindings/googlepb/test_vs_proto2.cc index 8e68791..06bea87 100644 --- a/tests/bindings/googlepb/test_vs_proto2.cc +++ b/tests/bindings/googlepb/test_vs_proto2.cc @@ -47,7 +47,7 @@ void compare_metadata(const google::protobuf::Descriptor* d, d->FindFieldByNumber(upb_f->number()); ASSERT(upb_f); ASSERT(proto2_f); - ASSERT(upb_f->number() == proto2_f->number()); + ASSERT(upb_f->number() == (uint32_t)proto2_f->number()); ASSERT(std::string(upb_f->name()) == proto2_f->name()); ASSERT(upb_f->descriptor_type() == static_cast<upb::FieldDef::DescriptorType>(proto2_f->type())); @@ -124,6 +124,8 @@ extern "C" { int run_tests(int argc, char *argv[]) { UPB_UNUSED(argc); UPB_UNUSED(argv); + UPB_UNUSED(message1_data); + UPB_UNUSED(message2_data); size_t len = sizeof(MESSAGE_DATA_IDENT); const char *str = (const char*)MESSAGE_DATA_IDENT; |