diff options
author | Joshua Haberman <joshua@reverberate.org> | 2010-01-05 18:30:36 -0800 |
---|---|---|
committer | Joshua Haberman <joshua@reverberate.org> | 2010-01-05 18:30:36 -0800 |
commit | 5864888c6e7424af70d84802b55879f406d2d7b2 (patch) | |
tree | 3608dbcc1ef7f34542835221743c8fcbe9e3b128 /tests/test_vs_proto2.cc | |
parent | d75197375876538332d6d81aa4e8edd13b8f26c1 (diff) | |
parent | 6a8dfa5f26500b90aa9ecab418abba98d1e4e356 (diff) |
Merge branch 'data-refactoring'. Ported benchmarks.
Conflicts:
src/upb_data.c
src/upb_data.h
Diffstat (limited to 'tests/test_vs_proto2.cc')
-rw-r--r-- | tests/test_vs_proto2.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_vs_proto2.cc b/tests/test_vs_proto2.cc index 63dc0f0..4356b05 100644 --- a/tests/test_vs_proto2.cc +++ b/tests/test_vs_proto2.cc @@ -25,7 +25,7 @@ void compare_arrays(const google::protobuf::Reflection *r, upb_msg *upb_msg, struct upb_fielddef *upb_f) { ASSERT(upb_msg_has(upb_msg, upb_f)); - upb_array *arr = upb_msg_get(upb_msg, upb_f).arr; + upb_arrayptr arr = upb_msg_get(upb_msg, upb_f).arr; ASSERT(upb_array_len(arr) == (upb_arraylen_t)r->FieldSize(proto2_msg, proto2_f)); for(upb_arraylen_t i = 0; i < upb_array_len(arr); i++) { union upb_value v = upb_array_get(arr, upb_f, i); |