aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsharptest <roger@csharptest.net>2015-02-07 15:34:06 -0600
committerrogerk <devnull@localhost>2015-02-07 15:34:06 -0600
commitb4bd2e0384609a18751a3584e18cbe52ed1542a4 (patch)
treeeb49a432c7ff40363563c1401abe6215dce096ab
parent1e29e701a73d3fa1466d6999b765aaddf12f1b59 (diff)
downloadprotobuf-b4bd2e0384609a18751a3584e18cbe52ed1542a4.tar.gz
protobuf-b4bd2e0384609a18751a3584e18cbe52ed1542a4.tar.bz2
protobuf-b4bd2e0384609a18751a3584e18cbe52ed1542a4.zip
Issue 84: warning CS0219: The variable `size' is assigned but its value is never used
-rw-r--r--src/ProtoGen/MessageGenerator.cs16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/ProtoGen/MessageGenerator.cs b/src/ProtoGen/MessageGenerator.cs
index fb43f3c9..e7ed1e86 100644
--- a/src/ProtoGen/MessageGenerator.cs
+++ b/src/ProtoGen/MessageGenerator.cs
@@ -360,7 +360,7 @@ namespace Google.ProtocolBuffers.ProtoGen
writer.WriteLine("public override void WriteTo(pb::ICodedOutputStream output) {");
writer.Indent();
// Make sure we've computed the serialized length, so that packed fields are generated correctly.
- writer.WriteLine("int size = SerializedSize;");
+ writer.WriteLine("CalcSerializedSize();");
writer.WriteLine("string[] field_names = _{0}FieldNames;", NameHelpers.UnderscoresToCamelCase(ClassName));
if (Descriptor.Proto.ExtensionRangeList.Count > 0)
{
@@ -412,6 +412,17 @@ namespace Google.ProtocolBuffers.ProtoGen
writer.Indent();
writer.WriteLine("int size = memoizedSerializedSize;");
writer.WriteLine("if (size != -1) return size;");
+ writer.WriteLine("return CalcSerializedSize();");
+ writer.Outdent();
+ writer.WriteLine("}");
+ writer.Outdent();
+ writer.WriteLine("}");
+ writer.WriteLine();
+
+ writer.WriteLine("private int CalcSerializedSize() {");
+ writer.Indent();
+ writer.WriteLine("int size = memoizedSerializedSize;");
+ writer.WriteLine("if (size != -1) return size;");
writer.WriteLine();
writer.WriteLine("size = 0;");
foreach (FieldDescriptor field in Descriptor.Fields)
@@ -438,9 +449,6 @@ namespace Google.ProtocolBuffers.ProtoGen
writer.WriteLine("return size;");
writer.Outdent();
writer.WriteLine("}");
- writer.Outdent();
- writer.WriteLine("}");
- writer.WriteLine();
}
private void GenerateSerializeOneField(TextGenerator writer, FieldDescriptor fieldDescriptor)