diff options
| author | csharptest <roger@csharptest.net> | 2010-11-08 20:06:46 -0600 |
|---|---|---|
| committer | unknown <rknapp@.svault.int> | 2010-11-08 20:06:46 -0600 |
| commit | 7d396f9d8a937ebfd7e27d7b253b11c47038491e (patch) | |
| tree | 4484b8295f6a46506a7fe265576440fa646ddaab /src/ProtocolBuffers/GeneratedBuilder.cs | |
| parent | 487da48ad2c88d7c07451c546c3541d7db7ceae6 (diff) | |
| download | protobuf-7d396f9d8a937ebfd7e27d7b253b11c47038491e.tar.gz protobuf-7d396f9d8a937ebfd7e27d7b253b11c47038491e.tar.bz2 protobuf-7d396f9d8a937ebfd7e27d7b253b11c47038491e.zip | |
Testing and related fixes
Diffstat (limited to 'src/ProtocolBuffers/GeneratedBuilder.cs')
| -rw-r--r-- | src/ProtocolBuffers/GeneratedBuilder.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ProtocolBuffers/GeneratedBuilder.cs b/src/ProtocolBuffers/GeneratedBuilder.cs index 1124fc86..01d3d2dd 100644 --- a/src/ProtocolBuffers/GeneratedBuilder.cs +++ b/src/ProtocolBuffers/GeneratedBuilder.cs @@ -148,10 +148,10 @@ namespace Google.ProtocolBuffers { } } else if (field.MappedType == MappedType.Message && HasField(field)) { // Merge singular embedded messages - IMessage oldValue = (IMessage)this[field]; + IMessageLite oldValue = (IMessageLite)this[field]; this[field] = oldValue.WeakCreateBuilderForType() .WeakMergeFrom(oldValue) - .WeakMergeFrom((IMessage)entry.Value) + .WeakMergeFrom((IMessageLite)entry.Value) .WeakBuildPartial(); } else { // Just overwrite |