diff options
| author | Jie Luo <anandolee@gmail.com> | 2017-01-26 14:00:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 14:00:08 -0800 |
| commit | 1f09786229b4a895467509851712138a50b19396 (patch) | |
| tree | d1394d0218562d99582de464ccb74c73caf6ecad /src/google | |
| parent | c2a5669773249f32f991f85700dde0ca49262cf7 (diff) | |
| parent | c15217f92239d9a209e4c798fc70debbdbd92a5e (diff) | |
| download | protobuf-1f09786229b4a895467509851712138a50b19396.tar.gz protobuf-1f09786229b4a895467509851712138a50b19396.tar.bz2 protobuf-1f09786229b4a895467509851712138a50b19396.zip | |
Merge pull request #2633 from anandolee/jieluo_branch1
Allow OneofOptions to be extended in proto3.
Diffstat (limited to 'src/google')
| -rw-r--r-- | src/google/protobuf/descriptor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index 7dfdb377..6104dcaa 100644 --- a/src/google/protobuf/descriptor.cc +++ b/src/google/protobuf/descriptor.cc @@ -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 |