From 4ecebd8b4a34c1f902176395024185f1724cb2eb Mon Sep 17 00:00:00 2001 From: csharptest Date: Fri, 16 Sep 2011 12:21:00 -0500 Subject: Tests and fixes for double-enumeration on AddRange and adding of null to PopsicleList --- src/ProtoGen/RepeatedEnumFieldGenerator.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ProtoGen/RepeatedEnumFieldGenerator.cs') diff --git a/src/ProtoGen/RepeatedEnumFieldGenerator.cs b/src/ProtoGen/RepeatedEnumFieldGenerator.cs index 5880390b..339e8181 100644 --- a/src/ProtoGen/RepeatedEnumFieldGenerator.cs +++ b/src/ProtoGen/RepeatedEnumFieldGenerator.cs @@ -88,7 +88,7 @@ namespace Google.ProtocolBuffers.ProtoGen writer.WriteLine(" return this;"); writer.WriteLine("}"); writer.WriteLine("public Builder AddRange{0}(scg::IEnumerable<{1}> values) {{", PropertyName, TypeName); - writer.WriteLine(" base.AddRange(values, result.{0}_);", Name); + writer.WriteLine(" result.{0}_.Add(values);", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); writer.WriteLine("public Builder Clear{0}() {{", PropertyName); @@ -100,7 +100,7 @@ namespace Google.ProtocolBuffers.ProtoGen public void GenerateMergingCode(TextGenerator writer) { writer.WriteLine("if (other.{0}_.Count != 0) {{", Name); - writer.WriteLine(" base.AddRange(other.{0}_, result.{0}_);", Name); + writer.WriteLine(" result.{0}_.Add(other.{0}_);", Name); writer.WriteLine("}"); } -- cgit v1.2.3