Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2633 from anandolee/jieluo_branch1

Browse Source 
Allow OneofOptions to be extended in proto3.
pull/2639/head
Jie Luo 8 years ago committed by GitHub
parent c2a5669773 c15217f922
commit 1f09786229
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/google/protobuf/descriptor.cc

2
src/google/protobuf/descriptor.cc
Unescape View File

@ -467,7 +467,7 @@ void InitAllowedProto3Extendee() {
allowed_proto3_extendees_ = new std::set<string>; allowed_proto3_extendees_ = new std::set<string>;
const char* kOptionNames[] = { const char* kOptionNames[] = {
"FileOptions", "MessageOptions", "FieldOptions", "EnumOptions", "FileOptions", "MessageOptions", "FieldOptions", "EnumOptions",
"EnumValueOptions", "ServiceOptions", "MethodOptions"}; "EnumValueOptions", "ServiceOptions", "MethodOptions", "OneofOptions"};
for (int i = 0; i < GOOGLE_ARRAYSIZE(kOptionNames); ++i) { for (int i = 0; i < GOOGLE_ARRAYSIZE(kOptionNames); ++i) {
// descriptor.proto has a different package name in opensource. We allow // descriptor.proto has a different package name in opensource. We allow
// both so the opensource protocol compiler can also compile internal // both so the opensource protocol compiler can also compile internal

Write Preview
Loading…
Cancel
Save