diff options
| author | Pete Warden <pete@petewarden.com> | 2016-03-09 13:05:15 -0800 |
|---|---|---|
| committer | Pete Warden <pete@petewarden.com> | 2016-03-09 13:05:15 -0800 |
| commit | bc2d6c2504b38dda4345e9960948d96102daccc3 (patch) | |
| tree | 48ad357a166b3bf9715a20714db8c117d8150c41 /ruby/ext/google/protobuf_c/protobuf.h | |
| parent | f0c1a8637218a03a083901493c9b3acdb6e5db57 (diff) | |
| parent | 48ebb29a8ec118bf6b9ee39f6be42b57321c099a (diff) | |
| download | protobuf-bc2d6c2504b38dda4345e9960948d96102daccc3.tar.gz protobuf-bc2d6c2504b38dda4345e9960948d96102daccc3.tar.bz2 protobuf-bc2d6c2504b38dda4345e9960948d96102daccc3.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'ruby/ext/google/protobuf_c/protobuf.h')
| -rw-r--r-- | ruby/ext/google/protobuf_c/protobuf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ruby/ext/google/protobuf_c/protobuf.h b/ruby/ext/google/protobuf_c/protobuf.h index 8750c93d..21ce7bb3 100644 --- a/ruby/ext/google/protobuf_c/protobuf.h +++ b/ruby/ext/google/protobuf_c/protobuf.h @@ -112,6 +112,7 @@ struct Descriptor { VALUE klass; // begins as nil const upb_handlers* fill_handlers; const upb_pbdecodermethod* fill_method; + const upb_json_parsermethod* json_fill_method; const upb_handlers* pb_serialize_handlers; const upb_handlers* json_serialize_handlers; // Handlers hold type class references for sub-message fields directly in some |