First pass at wrapper types.

- We do still generate the message types, as otherwise reflection breaks, even though it doesn't actually use those types.
- JSON handling hasn't been implemented yet

1 files changed, 3 insertions, 5 deletions

diff --git a/csharp/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs b/csharp/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs
index a3e7c1bb..bf221c9c 100644
--- a/csharp/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs
+++ b/csharp/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs
@@ -129,8 +129,7 @@ namespace Google.Protobuf
         public static int ComputeStringSize(String value)

         {

             int byteArraySize = Utf8Encoding.GetByteCount(value);

-            return ComputeRawVarint32Size((uint) byteArraySize) +

-                   byteArraySize;

+            return ComputeLengthSize(byteArraySize) + byteArraySize;

         }

 

         /// <summary>

@@ -149,7 +148,7 @@ namespace Google.Protobuf
         public static int ComputeMessageSize(IMessage value)

         {

             int size = value.CalculateSize();

-            return ComputeRawVarint32Size((uint) size) + size;

+            return ComputeLengthSize(size) + size;

         }

 

         /// <summary>

@@ -158,8 +157,7 @@ namespace Google.Protobuf
         /// </summary>

         public static int ComputeBytesSize(ByteString value)

         {

-            return ComputeRawVarint32Size((uint) value.Length) +

-                   value.Length;

+            return ComputeLengthSize(value.Length) + value.Length;

         }

 

         /// <summary>