diff options
| author | Jon Skeet <skeet@pobox.com> | 2016-01-16 18:28:13 +0000 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2016-01-16 18:28:13 +0000 |
| commit | d522479aa0f12f55816b0f967750c520d7c8ec37 (patch) | |
| tree | 2c08b2ab41f81b32796934290751aa3fee17403e /src | |
| parent | 1e113df20a0b23c058fd3f948aec78dc274cc8cb (diff) | |
| parent | 030c2684899b2b84f1023d668c5bf40b6ce1143d (diff) | |
| download | protobuf-d522479aa0f12f55816b0f967750c520d7c8ec37.tar.gz protobuf-d522479aa0f12f55816b0f967750c520d7c8ec37.tar.bz2 protobuf-d522479aa0f12f55816b0f967750c520d7c8ec37.zip | |
Merge pull request #1145 from jskeet/conformance
JSON Conformance improvements
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/unittest_well_known_types.proto | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/unittest_well_known_types.proto b/src/google/protobuf/unittest_well_known_types.proto index 2cb7775c..c9075244 100644 --- a/src/google/protobuf/unittest_well_known_types.proto +++ b/src/google/protobuf/unittest_well_known_types.proto @@ -39,6 +39,8 @@ message TestWellKnownTypes { google.protobuf.BoolValue bool_field = 16; google.protobuf.StringValue string_field = 17; google.protobuf.BytesValue bytes_field = 18; + // Part of struct, but useful to be able to test separately + google.protobuf.Value value_field = 19; } // A repeated field for each well-known type. |