diff options
| author | csharptest <roger@csharptest.net> | 2010-11-05 11:06:13 -0500 |
|---|---|---|
| committer | csharptest <roger@csharptest.net> | 2010-11-05 11:06:13 -0500 |
| commit | 6b812f8a8301284e35f8e299723dd747eee2a32c (patch) | |
| tree | bae78247ea364245c644d05adea0ab0517575f76 /src/ProtocolBuffers/DynamicMessage.cs | |
| parent | a6722c34d9ee594bbaec8284b1d195d94ae27086 (diff) | |
| download | protobuf-6b812f8a8301284e35f8e299723dd747eee2a32c.tar.gz protobuf-6b812f8a8301284e35f8e299723dd747eee2a32c.tar.bz2 protobuf-6b812f8a8301284e35f8e299723dd747eee2a32c.zip | |
Working split for lite interfaces
Diffstat (limited to 'src/ProtocolBuffers/DynamicMessage.cs')
| -rw-r--r-- | src/ProtocolBuffers/DynamicMessage.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ProtocolBuffers/DynamicMessage.cs b/src/ProtocolBuffers/DynamicMessage.cs index 0653fcf4..12f2186c 100644 --- a/src/ProtocolBuffers/DynamicMessage.cs +++ b/src/ProtocolBuffers/DynamicMessage.cs @@ -338,7 +338,7 @@ namespace Google.ProtocolBuffers { get { return fields.IsInitializedWithRespectTo(type); } } - public override Builder MergeFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry) { + public override Builder MergeFrom(CodedInputStream input, ExtensionRegistry extensionRegistry) { UnknownFieldSet.Builder unknownFieldsBuilder = UnknownFieldSet.CreateBuilder(unknownFields); unknownFieldsBuilder.MergeFrom(input, extensionRegistry, this); unknownFields = unknownFieldsBuilder.Build(); |