diff options
| author | csharptest <roger@csharptest.net> | 2011-09-09 13:39:54 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2011-09-09 13:39:54 -0500 |
| commit | a105eac521b6a810b9c40db2febba412e316d0b2 (patch) | |
| tree | adbc078b2c5c8131a392c8ea54c26c5e2a55b5e4 /src/ProtocolBuffers | |
| parent | 8f0dcf3df1548a1eff0bed54a9b992f55b8f72d5 (diff) | |
| download | protobuf-a105eac521b6a810b9c40db2febba412e316d0b2.tar.gz protobuf-a105eac521b6a810b9c40db2febba412e316d0b2.tar.bz2 protobuf-a105eac521b6a810b9c40db2febba412e316d0b2.zip | |
Added support for negative enum values and tests
Diffstat (limited to 'src/ProtocolBuffers')
| -rw-r--r-- | src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs | 4 | ||||
| -rw-r--r-- | src/ProtocolBuffers/CodedOutputStream.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs b/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs index 50bf28d2..2da0080e 100644 --- a/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs +++ b/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs @@ -202,7 +202,7 @@ namespace Google.ProtocolBuffers /// </summary>
public static int ComputeEnumSize(int fieldNumber, int value)
{
- return ComputeTagSize(fieldNumber) + ComputeRawVarint32Size((uint) value);
+ return ComputeTagSize(fieldNumber) + ComputeEnumSizeNoTag(value);
}
/// <summary>
@@ -391,7 +391,7 @@ namespace Google.ProtocolBuffers /// </summary>
public static int ComputeEnumSizeNoTag(int value)
{
- return ComputeRawVarint32Size((uint) value);
+ return ComputeInt32SizeNoTag(value);
}
/// <summary>
diff --git a/src/ProtocolBuffers/CodedOutputStream.cs b/src/ProtocolBuffers/CodedOutputStream.cs index c14f5e0d..09099ee3 100644 --- a/src/ProtocolBuffers/CodedOutputStream.cs +++ b/src/ProtocolBuffers/CodedOutputStream.cs @@ -373,7 +373,7 @@ namespace Google.ProtocolBuffers public void WriteEnum(int fieldNumber, string fieldName, int value, object rawValue)
{
WriteTag(fieldNumber, WireFormat.WireType.Varint);
- WriteRawVarint32((uint) value);
+ WriteInt32NoTag(value);
}
public void WriteSFixed32(int fieldNumber, string fieldName, int value)
@@ -648,7 +648,7 @@ namespace Google.ProtocolBuffers public void WriteEnumNoTag(int value)
{
- WriteRawVarint32((uint) value);
+ WriteInt32NoTag(value);
}
public void WriteSFixed32NoTag(int value)
|