aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/unittest_well_known_types.proto
diff options
context:
space:
mode:
authorGravatar Jon Skeet <jonskeet@google.com>2015-07-16 17:03:06 +0100
committerGravatar Jon Skeet <jonskeet@google.com>2015-07-16 17:03:06 +0100
commit8a0312b20156aa4df092cb6b3c665ef48cb6fa54 (patch)
tree8a5864fa5e8481ed8b04a25404cf51bc1818a37e /src/google/protobuf/unittest_well_known_types.proto
parent8d47ec4f3e3368c5f4e7ac195f20978abc8a692f (diff)
First pass at wrapper types.
- We do still generate the message types, as otherwise reflection breaks, even though it doesn't actually use those types. - JSON handling hasn't been implemented yet
Diffstat (limited to 'src/google/protobuf/unittest_well_known_types.proto')
-rw-r--r--src/google/protobuf/unittest_well_known_types.proto20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/google/protobuf/unittest_well_known_types.proto b/src/google/protobuf/unittest_well_known_types.proto
index 4771c094..2cb7775c 100644
--- a/src/google/protobuf/unittest_well_known_types.proto
+++ b/src/google/protobuf/unittest_well_known_types.proto
@@ -52,16 +52,16 @@ message RepeatedWellKnownTypes {
repeated google.protobuf.Struct struct_field = 7;
repeated google.protobuf.Timestamp timestamp_field = 8;
repeated google.protobuf.Type type_field = 9;
- // TODO: Do these even make sense? Should they be prohibited?
-// repeated google.protobuf.DoubleValue double_field = 10;
-// repeated google.protobuf.FloatValue float_field = 11;
-// repeated google.protobuf.Int64Value int64_field = 12;
-// repeated google.protobuf.UInt64Value uint64_field = 13;
-// repeated google.protobuf.Int32Value int32_field = 14;
-// repeated google.protobuf.UInt32Value uint32_field = 15;
-// repeated google.protobuf.BoolValue bool_field = 16;
-// repeated google.protobuf.StringValue string_field = 17;
-// repeated google.protobuf.BytesValue bytes_field = 18;
+ // These don't actually make a lot of sense, but they're not prohibited...
+ repeated google.protobuf.DoubleValue double_field = 10;
+ repeated google.protobuf.FloatValue float_field = 11;
+ repeated google.protobuf.Int64Value int64_field = 12;
+ repeated google.protobuf.UInt64Value uint64_field = 13;
+ repeated google.protobuf.Int32Value int32_field = 14;
+ repeated google.protobuf.UInt32Value uint32_field = 15;
+ repeated google.protobuf.BoolValue bool_field = 16;
+ repeated google.protobuf.StringValue string_field = 17;
+ repeated google.protobuf.BytesValue bytes_field = 18;
}
message OneofWellKnownTypes {