diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2019-04-19 16:19:57 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2019-04-19 16:19:57 -0700 |
| commit | 151ebc8a2925bca5210ac447156a6a783f1d9337 (patch) | |
| tree | 15ff3f0b9d15dc18cd56ffd637f9d177e887a60d /tests | |
| parent | cf35baa1ad70f0dca734f93bcc2b54d8d059bcdd (diff) | |
Fixed oneof case accessor to cast to enum for C++.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/json/test.proto | 5 | ||||
| -rw-r--r-- | tests/json/test.proto.pb | bin | 1883 -> 1958 bytes | |||
| -rw-r--r-- | tests/json/test_json.cc | 1 |
3 files changed, 6 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 { diff --git a/tests/json/test.proto.pb b/tests/json/test.proto.pb Binary files differindex 5da355d..94b8b92 100644 --- a/tests/json/test.proto.pb +++ b/tests/json/test.proto.pb diff --git a/tests/json/test_json.cc b/tests/json/test_json.cc index 3fddfb6..6650817 100644 --- a/tests/json/test_json.cc +++ b/tests/json/test_json.cc @@ -4,6 +4,7 @@ */ #include "tests/json/test.upbdefs.h" +#include "tests/json/test.upb.h" // Test that it compiles for C++. #include "tests/test_util.h" #include "tests/upb_test.h" #include "upb/handlers.h" |