diff options
| author | Chris Fallin <cfallin@google.com> | 2015-05-14 18:24:26 -0700 |
|---|---|---|
| committer | Chris Fallin <cfallin@google.com> | 2015-05-15 11:36:12 -0700 |
| commit | d326277397e345b5bda4a8afbd0a9d54f01b9a06 (patch) | |
| tree | 06374379f0c2290e69110c787a5ad347e262eac6 /ruby/ext/google/protobuf_c/message.c | |
| parent | b481a4f920d2f5872bc1e9bfd6b0656f6ad0b713 (diff) | |
| download | protobuf-d326277397e345b5bda4a8afbd0a9d54f01b9a06.tar.gz protobuf-d326277397e345b5bda4a8afbd0a9d54f01b9a06.tar.bz2 protobuf-d326277397e345b5bda4a8afbd0a9d54f01b9a06.zip | |
Update MRI C Ruby extension to use new version of upb.
- Alter encode/decode paths to use the `upb_env` (environment)
abstraction.
- Update upb amalgamation to upstream `93791bfe`.
- Fix a compilation warning (void*->char* cast).
- Modify build flags so that upb doesn't produce warnings -- the Travis
build logs were pretty cluttered previously.
Diffstat (limited to 'ruby/ext/google/protobuf_c/message.c')
| -rw-r--r-- | ruby/ext/google/protobuf_c/message.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/ext/google/protobuf_c/message.c b/ruby/ext/google/protobuf_c/message.c index 7e58a617..ee5f23a5 100644 --- a/ruby/ext/google/protobuf_c/message.c +++ b/ruby/ext/google/protobuf_c/message.c @@ -86,7 +86,7 @@ static VALUE which_oneof_field(MessageHeader* self, const upb_oneofdef* o) { size_t case_ofs = self->descriptor->layout-> fields[upb_fielddef_index(first_field)].case_offset; - uint32_t oneof_case = *((uint32_t*)(Message_data(self) + case_ofs)); + uint32_t oneof_case = *((uint32_t*)((char*)Message_data(self) + case_ofs)); if (oneof_case == ONEOF_CASE_NONE) { return Qnil; |