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/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.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/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs')
| -rw-r--r-- | src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs index 8a6bb589..34de1a98 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs @@ -1499,7 +1499,7 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(RawMessageSet other) {
if (other == global::Google.ProtocolBuffers.TestProtos.RawMessageSet.DefaultInstance) return this;
if (other.item_.Count != 0) {
- base.AddRange(other.item_, result.item_);
+ result.item_.Add(other.item_);
}
this.MergeUnknownFields(other.UnknownFields);
return this;
@@ -1587,7 +1587,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this;
}
public Builder AddRangeItem(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item> values) {
- base.AddRange(values, result.item_);
+ result.item_.Add(values);
return this;
}
public Builder ClearItem() {
|