aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jie Luo <jieluo@google.com>2017-01-18 16:26:22 -0800
committerGravatar Jie Luo <jieluo@google.com>2017-01-25 16:22:15 -0800
commitc15217f92239d9a209e4c798fc70debbdbd92a5e (patch)
tree103bda97c4b3f3f26d3744aed60aa2d8670095c0
parenteed9951991c6ee7c629b5c4252444c372f7774fd (diff)
Allow OneofOptions to be extended in proto3.
-rw-r--r--src/google/protobuf/descriptor.cc2
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