Verify build with protobuf-3.0.0, fix problems.

Also updated descriptor.proto from protobuf-3.0.0.
This commit is contained in:
Petteri Aimonen
2014-12-22 22:52:36 +02:00
parent cfc517f36b
commit e5cbee84e1
4 changed files with 126 additions and 28 deletions

View File

@@ -7,8 +7,8 @@ extend AllTypes {
message ExtensionMessage {
extend AllTypes {
optional ExtensionMessage AllTypes_extensionfield2 = 254;
required ExtensionMessage AllTypes_extensionfield3 = 253;
repeated ExtensionMessage AllTypes_extensionfield4 = 252;
// required ExtensionMessage AllTypes_extensionfield3 = 253; // No longer allowed by protobuf 3
repeated ExtensionMessage AllTypes_extensionfield4 = 252;
}
required string test1 = 1;