diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-03-04 17:31:11 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-03-04 17:31:11 -0800 |
| commit | e70f9256af79af6092eae4ce22a61b1b6651f37d (patch) | |
| tree | 5d9bdbb84c876d6e6d34fef8348ad4ed282e0336 /ruby/ext/google/protobuf_c/protobuf.h | |
| parent | 37663e861b3fe0288d10e67d387fdcf0e43a6d72 (diff) | |
| parent | f654d49dd61c096c247b87186e59b611490e66e4 (diff) | |
| download | protobuf-e70f9256af79af6092eae4ce22a61b1b6651f37d.tar.gz protobuf-e70f9256af79af6092eae4ce22a61b1b6651f37d.tar.bz2 protobuf-e70f9256af79af6092eae4ce22a61b1b6651f37d.zip | |
Merge pull request #1139 from haberman/rubyjsoncamel
Changed Ruby to properly camelCase its JSON by default.
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 |