diff options
| author | csharptest <roger@csharptest.net> | 2010-11-05 11:55:25 -0500 |
|---|---|---|
| committer | csharptest <roger@csharptest.net> | 2010-11-05 11:55:25 -0500 |
| commit | 97f86ce9de5cfedce0dc1db4dbcef739807fe9ef (patch) | |
| tree | a057d19ac24df6f848e19902623770ce384e91df /src/ProtocolBuffers | |
| parent | 6b812f8a8301284e35f8e299723dd747eee2a32c (diff) | |
| download | protobuf-97f86ce9de5cfedce0dc1db4dbcef739807fe9ef.tar.gz protobuf-97f86ce9de5cfedce0dc1db4dbcef739807fe9ef.tar.bz2 protobuf-97f86ce9de5cfedce0dc1db4dbcef739807fe9ef.zip | |
missing virtual on MergeFrom
Diffstat (limited to 'src/ProtocolBuffers')
| -rw-r--r-- | src/ProtocolBuffers/AbstractBuilder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ProtocolBuffers/AbstractBuilder.cs b/src/ProtocolBuffers/AbstractBuilder.cs index 4db89c68..240ce36b 100644 --- a/src/ProtocolBuffers/AbstractBuilder.cs +++ b/src/ProtocolBuffers/AbstractBuilder.cs @@ -263,7 +263,7 @@ namespace Google.ProtocolBuffers { return MergeFrom((IMessage)other); } - public TBuilder MergeFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry) { + public virtual TBuilder MergeFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry) { #warning Not implemented for Lite edition return MergeFrom(input, (ExtensionRegistry)extensionRegistry); } |