aboutsummaryrefslogtreecommitdiff
path: root/src/ProtocolBuffers/DynamicMessage.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/ProtocolBuffers/DynamicMessage.cs')
-rw-r--r--src/ProtocolBuffers/DynamicMessage.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ProtocolBuffers/DynamicMessage.cs b/src/ProtocolBuffers/DynamicMessage.cs
index 12f2186c..0653fcf4 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, ExtensionRegistry extensionRegistry) {
+ public override Builder MergeFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry) {
UnknownFieldSet.Builder unknownFieldsBuilder = UnknownFieldSet.CreateBuilder(unknownFields);
unknownFieldsBuilder.MergeFrom(input, extensionRegistry, this);
unknownFields = unknownFieldsBuilder.Build();