diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-04-15 12:57:39 -0700 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2016-04-15 12:57:39 -0700 |
commit | ca9bbd71d547a05604e8c2bddda66cdba5abe0c4 (patch) | |
tree | 4c61ab7d12d62aae7f690deefda827abeb7cb6e8 /ruby/ext/google/protobuf_c/protobuf.h | |
parent | 814685ca2cd9280ca401e1842fd6311440921a0a (diff) | |
parent | e67ef3d449011c7923cf4c1e4b205ebd0d6f2167 (diff) | |
download | protobuf-ca9bbd71d547a05604e8c2bddda66cdba5abe0c4.tar.gz protobuf-ca9bbd71d547a05604e8c2bddda66cdba5abe0c4.tar.bz2 protobuf-ca9bbd71d547a05604e8c2bddda66cdba5abe0c4.zip |
Merge pull request #1413 from haberman/updateupb
Updated upb: JSON parser now accepts both camelCase and original case, and flag to choose on output.
Diffstat (limited to 'ruby/ext/google/protobuf_c/protobuf.h')
-rw-r--r-- | ruby/ext/google/protobuf_c/protobuf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ruby/ext/google/protobuf_c/protobuf.h b/ruby/ext/google/protobuf_c/protobuf.h index 21ce7bb3..2834c894 100644 --- a/ruby/ext/google/protobuf_c/protobuf.h +++ b/ruby/ext/google/protobuf_c/protobuf.h @@ -115,6 +115,7 @@ struct Descriptor { const upb_json_parsermethod* json_fill_method; const upb_handlers* pb_serialize_handlers; const upb_handlers* json_serialize_handlers; + const upb_handlers* json_serialize_handlers_preserve; // Handlers hold type class references for sub-message fields directly in some // cases. We need to keep these rooted because they might otherwise be // collected. @@ -498,7 +499,7 @@ VALUE Message_descriptor(VALUE klass); VALUE Message_decode(VALUE klass, VALUE data); VALUE Message_encode(VALUE klass, VALUE msg_rb); VALUE Message_decode_json(VALUE klass, VALUE data); -VALUE Message_encode_json(VALUE klass, VALUE msg_rb); +VALUE Message_encode_json(int argc, VALUE* argv, VALUE klass); VALUE Google_Protobuf_deep_copy(VALUE self, VALUE obj); |