From c15217f92239d9a209e4c798fc70debbdbd92a5e Mon Sep 17 00:00:00 2001 From: Jie Luo Date: Wed, 18 Jan 2017 16:26:22 -0800 Subject: [PATCH] Allow OneofOptions to be extended in proto3. --- src/google/protobuf/descriptor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index 7dfdb3773a..6104dcaab7 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; 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