diff options
author | csharptest <roger@csharptest.net> | 2011-09-16 12:21:00 -0500 |
---|---|---|
committer | rogerk <devnull@localhost> | 2011-09-16 12:21:00 -0500 |
commit | 4ecebd8b4a34c1f902176395024185f1724cb2eb (patch) | |
tree | b66dbd1ef1b8fc8f4b4813f4ac7522fc25d637dc /src/AddressBook/AddressBookProtos.cs | |
parent | 8f0dcf3df1548a1eff0bed54a9b992f55b8f72d5 (diff) | |
download | protobuf-4ecebd8b4a34c1f902176395024185f1724cb2eb.tar.gz protobuf-4ecebd8b4a34c1f902176395024185f1724cb2eb.tar.bz2 protobuf-4ecebd8b4a34c1f902176395024185f1724cb2eb.zip |
Tests and fixes for double-enumeration on AddRange and adding of null to PopsicleList
Diffstat (limited to 'src/AddressBook/AddressBookProtos.cs')
-rw-r--r-- | src/AddressBook/AddressBookProtos.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/AddressBook/AddressBookProtos.cs b/src/AddressBook/AddressBookProtos.cs index 4d391f0f..7df3a7d4 100644 --- a/src/AddressBook/AddressBookProtos.cs +++ b/src/AddressBook/AddressBookProtos.cs @@ -593,7 +593,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { Email = other.Email;
}
if (other.phone_.Count != 0) {
- base.AddRange(other.phone_, result.phone_);
+ result.phone_.Add(other.phone_);
}
this.MergeUnknownFields(other.UnknownFields);
return this;
@@ -749,7 +749,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { return this;
}
public Builder AddRangePhone(scg::IEnumerable<global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber> values) {
- base.AddRange(values, result.phone_);
+ result.phone_.Add(values);
return this;
}
public Builder ClearPhone() {
@@ -926,7 +926,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { public override Builder MergeFrom(AddressBook other) {
if (other == global::Google.ProtocolBuffers.Examples.AddressBook.AddressBook.DefaultInstance) return this;
if (other.person_.Count != 0) {
- base.AddRange(other.person_, result.person_);
+ result.person_.Add(other.person_);
}
this.MergeUnknownFields(other.UnknownFields);
return this;
@@ -1014,7 +1014,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { return this;
}
public Builder AddRangePerson(scg::IEnumerable<global::Google.ProtocolBuffers.Examples.AddressBook.Person> values) {
- base.AddRange(values, result.person_);
+ result.person_.Add(values);
return this;
}
public Builder ClearPerson() {
|