diff options
| author |  Joshua Haberman <jhaberman@gmail.com> | 2016-04-11 23:37:42 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-04-11 23:37:42 -0700 |
| commit | 814685ca2cd9280ca401e1842fd6311440921a0a (patch) | |
| tree | 5c2cac2b5ba07fe345fdda74c270b32c8f7b9331 /src/google/protobuf/unittest_lite.proto | |
| parent | 3ffbdd712f0413ce4964d626c5e10533f1f74893 (diff) | |
| parent | 3c4ce528c63f4dc39d15de963020472980ee7229 (diff) | |
Merge pull request #1397 from google/internal-merge
Internal merge
Diffstat (limited to 'src/google/protobuf/unittest_lite.proto')
| -rw-r--r-- | src/google/protobuf/unittest_lite.proto | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/google/protobuf/unittest_lite.proto b/src/google/protobuf/unittest_lite.proto index 662c0e46..41ed845f 100644 --- a/src/google/protobuf/unittest_lite.proto +++ b/src/google/protobuf/unittest_lite.proto @@ -43,8 +43,10 @@ option java_package = "com.google.protobuf"; // Same as TestAllTypes but with the lite runtime. message TestAllTypesLite { + message NestedMessage { optional int32 bb = 1; + optional int64 cc = 2; } enum NestedEnum { @@ -159,6 +161,7 @@ message TestAllTypesLite { NestedMessage oneof_nested_message = 112; string oneof_string = 113; bytes oneof_bytes = 114; + NestedMessage oneof_lazy_nested_message = 115 [lazy = true]; } } |