diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2019-06-02 20:36:42 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2019-06-02 20:36:42 -0700 |
| commit | 583f24fec1f3773b86168db2d2e4f95f36c3324d (patch) | |
| tree | c15ac3932d77d55269eb19ec72b2887b6571ba35 /tests/json/test.proto | |
| parent | 932753d91e183ab25cf1a0f420d9488295002297 (diff) | |
| parent | 9f49efef6203973931894a4ed9b862b3e3d639f0 (diff) | |
Merge branch 'master' into rmreflective
Diffstat (limited to 'tests/json/test.proto')
| -rw-r--r-- | tests/json/test.proto | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/json/test.proto b/tests/json/test.proto index e659001..2db0388 100644 --- a/tests/json/test.proto +++ b/tests/json/test.proto @@ -29,6 +29,11 @@ message TestMessage { map<string, int32> map_string_int32 = 23; map<string, bool> map_string_bool = 24; map<string, SubMessage> map_string_msg = 25; + + oneof o { + int32 oneof_int32 = 26; + int64 oneof_int64 = 27; + } } message SubMessage { |