| Index: third_party/protobuf/csharp/src/AddressBook/Addressbook.cs
|
| diff --git a/third_party/protobuf/csharp/src/AddressBook/Addressbook.cs b/third_party/protobuf/csharp/src/AddressBook/Addressbook.cs
|
| index 2c81004c5bd4b25828768976a018f712078977b0..362e1cb6a2c29082d6ec86cbcb7ba6903d028664 100644
|
| --- a/third_party/protobuf/csharp/src/AddressBook/Addressbook.cs
|
| +++ b/third_party/protobuf/csharp/src/AddressBook/Addressbook.cs
|
| @@ -34,9 +34,9 @@ namespace Google.Protobuf.Examples.AddressBook {
|
| "cGxlcy5BZGRyZXNzQm9va2IGcHJvdG8z"));
|
| descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
|
| new pbr::FileDescriptor[] { },
|
| - new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] {
|
| - new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.Person), global::Google.Protobuf.Examples.AddressBook.Person.Parser, new[]{ "Name", "Id", "Email", "Phones" }, null, new[]{ typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType) }, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber), global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber.Parser, new[]{ "Number", "Type" }, null, null, null)}),
|
| - new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.AddressBook), global::Google.Protobuf.Examples.AddressBook.AddressBook.Parser, new[]{ "People" }, null, null, null)
|
| + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
|
| + new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.Person), global::Google.Protobuf.Examples.AddressBook.Person.Parser, new[]{ "Name", "Id", "Email", "Phones" }, null, new[]{ typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType) }, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber), global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber.Parser, new[]{ "Number", "Type" }, null, null, null)}),
|
| + new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.AddressBook), global::Google.Protobuf.Examples.AddressBook.AddressBook.Parser, new[]{ "People" }, null, null, null)
|
| }));
|
| }
|
| #endregion
|
| @@ -82,7 +82,7 @@ namespace Google.Protobuf.Examples.AddressBook {
|
| public string Name {
|
| get { return name_; }
|
| set {
|
| - name_ = pb::Preconditions.CheckNotNull(value, "value");
|
| + name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
|
| }
|
| }
|
|
|
| @@ -105,7 +105,7 @@ namespace Google.Protobuf.Examples.AddressBook {
|
| public string Email {
|
| get { return email_; }
|
| set {
|
| - email_ = pb::Preconditions.CheckNotNull(value, "value");
|
| + email_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
|
| }
|
| }
|
|
|
| @@ -228,9 +228,9 @@ namespace Google.Protobuf.Examples.AddressBook {
|
| [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
| public static partial class Types {
|
| public enum PhoneType {
|
| - MOBILE = 0,
|
| - HOME = 1,
|
| - WORK = 2,
|
| + [pbr::OriginalName("MOBILE")] Mobile = 0,
|
| + [pbr::OriginalName("HOME")] Home = 1,
|
| + [pbr::OriginalName("WORK")] Work = 2,
|
| }
|
|
|
| [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
| @@ -267,13 +267,13 @@ namespace Google.Protobuf.Examples.AddressBook {
|
| public string Number {
|
| get { return number_; }
|
| set {
|
| - number_ = pb::Preconditions.CheckNotNull(value, "value");
|
| + number_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
|
| }
|
| }
|
|
|
| /// <summary>Field number for the "type" field.</summary>
|
| public const int TypeFieldNumber = 2;
|
| - private global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType type_ = global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE;
|
| + private global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType type_ = 0;
|
| public global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType Type {
|
| get { return type_; }
|
| set {
|
| @@ -300,7 +300,7 @@ namespace Google.Protobuf.Examples.AddressBook {
|
| public override int GetHashCode() {
|
| int hash = 1;
|
| if (Number.Length != 0) hash ^= Number.GetHashCode();
|
| - if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) hash ^= Type.GetHashCode();
|
| + if (Type != 0) hash ^= Type.GetHashCode();
|
| return hash;
|
| }
|
|
|
| @@ -313,7 +313,7 @@ namespace Google.Protobuf.Examples.AddressBook {
|
| output.WriteRawTag(10);
|
| output.WriteString(Number);
|
| }
|
| - if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) {
|
| + if (Type != 0) {
|
| output.WriteRawTag(16);
|
| output.WriteEnum((int) Type);
|
| }
|
| @@ -324,7 +324,7 @@ namespace Google.Protobuf.Examples.AddressBook {
|
| if (Number.Length != 0) {
|
| size += 1 + pb::CodedOutputStream.ComputeStringSize(Number);
|
| }
|
| - if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) {
|
| + if (Type != 0) {
|
| size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
|
| }
|
| return size;
|
| @@ -337,7 +337,7 @@ namespace Google.Protobuf.Examples.AddressBook {
|
| if (other.Number.Length != 0) {
|
| Number = other.Number;
|
| }
|
| - if (other.Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) {
|
| + if (other.Type != 0) {
|
| Type = other.Type;
|
| }
|
| }
|
|
|