Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
97f86ce9
Commit
97f86ce9
authored
Nov 05, 2010
by
csharptest
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
missing virtual on MergeFrom
parent
6b812f8a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
ProtocolBuffers.sln
src/ProtocolBuffers.sln
+1
-0
AbstractBuilder.cs
src/ProtocolBuffers/AbstractBuilder.cs
+1
-1
No files found.
src/ProtocolBuffers.sln
View file @
97f86ce9
...
...
@@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "proto", "proto", "{1F896D5C
..\protos\tutorial\addressbook.proto = ..\protos\tutorial\addressbook.proto
..\protos\google\protobuf\csharp_options.proto = ..\protos\google\protobuf\csharp_options.proto
..\protos\google\protobuf\descriptor.proto = ..\protos\google\protobuf\descriptor.proto
..\ProtocolBuffers.build = ..\ProtocolBuffers.build
..\todo.txt = ..\todo.txt
EndProjectSection
EndProject
...
...
src/ProtocolBuffers/AbstractBuilder.cs
View file @
97f86ce9
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment