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
c15217f9
Commit
c15217f9
authored
8 years ago
by
Jie Luo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow OneofOptions to be extended in proto3.
parent
eed99519
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
descriptor.cc
src/google/protobuf/descriptor.cc
+1
-1
No files found.
src/google/protobuf/descriptor.cc
View file @
c15217f9
...
...
@@ -467,7 +467,7 @@ void InitAllowedProto3Extendee() {
allowed_proto3_extendees_
=
new
std
::
set
<
string
>
;
const
char
*
kOptionNames
[]
=
{
"FileOptions"
,
"MessageOptions"
,
"FieldOptions"
,
"EnumOptions"
,
"EnumValueOptions"
,
"ServiceOptions"
,
"MethodOptions"
};
"EnumValueOptions"
,
"ServiceOptions"
,
"MethodOptions"
,
"OneofOptions"
};
for
(
int
i
=
0
;
i
<
GOOGLE_ARRAYSIZE
(
kOptionNames
);
++
i
)
{
// descriptor.proto has a different package name in opensource. We allow
// both so the opensource protocol compiler can also compile internal
...
...
This diff is collapsed.
Click to expand it.
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