diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-03-29 16:24:35 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-29 16:24:35 -0700 |
| commit | a15b916c419000565384a78224e402ed925e5fc8 (patch) | |
| tree | d0bd6aa4648fddbb08d35d8b78dba32958ae7b51 /ruby/ext/google/protobuf_c/protobuf.h | |
| parent | 67c727cd411a339eb4233c84d9a1afadd8c20566 (diff) | |
| parent | 261ee021f640ea6fe67aaf1f53e1518ed154cad0 (diff) | |
| download | protobuf-a15b916c419000565384a78224e402ed925e5fc8.tar.gz protobuf-a15b916c419000565384a78224e402ed925e5fc8.tar.bz2 protobuf-a15b916c419000565384a78224e402ed925e5fc8.zip | |
Merge branch 'master' into docker
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 |