aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorJon Skeet <jonskeet@google.com>2015-07-01 17:16:55 +0100
committerJon Skeet <jonskeet@google.com>2015-07-09 08:26:05 +0100
commit5350822b0a923287bc23375a10c2f3cb07cff5fb (patch)
treec9f2d54e9254d6c74acacdfea042c1b1743d672b /examples
parent493e3db98532e99a53cec914d8f4827a556ee408 (diff)
downloadprotobuf-5350822b0a923287bc23375a10c2f3cb07cff5fb.tar.gz
protobuf-5350822b0a923287bc23375a10c2f3cb07cff5fb.tar.bz2
protobuf-5350822b0a923287bc23375a10c2f3cb07cff5fb.zip
Regenerated code due to previous commit.
Note that now we need a proto3 version of addressbook.proto. This may affect other platforms, and could do with an overhaul to follow proto3 conventions anyway (e.g. repeated field names). Will need to think about that carefully before merging into master. Raised issue #565 for this.
Diffstat (limited to 'examples')
-rw-r--r--examples/addressbook.proto12
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/addressbook.proto b/examples/addressbook.proto
index 9ab45427..5da5fa39 100644
--- a/examples/addressbook.proto
+++ b/examples/addressbook.proto
@@ -1,6 +1,6 @@
// See README.txt for information and build instructions.
-syntax = "proto2";
+syntax = "proto3";
package tutorial;
@@ -9,9 +9,9 @@ option java_outer_classname = "AddressBookProtos";
option csharp_namespace = "Google.Protobuf.Examples.AddressBook";
message Person {
- required string name = 1;
- required int32 id = 2; // Unique ID number for this person.
- optional string email = 3;
+ string name = 1;
+ int32 id = 2; // Unique ID number for this person.
+ string email = 3;
enum PhoneType {
MOBILE = 0;
@@ -20,8 +20,8 @@ message Person {
}
message PhoneNumber {
- required string number = 1;
- optional PhoneType type = 2 [default = HOME];
+ string number = 1;
+ PhoneType type = 2;
}
repeated PhoneNumber phone = 4;