diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:10 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:10 -0800 |
| commit | 92a7e778e7394386f413cec28d67a07630f784b1 (patch) | |
| tree | cb5673c7c09b0d3905b48a24765d07e423bc5b30 /src/google/protobuf/compiler/cpp/cpp_helpers.cc | |
| parent | ce0a53273a400369932ba788d17500336a6ecaad (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_helpers.cc')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_helpers.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_helpers.cc b/src/google/protobuf/compiler/cpp/cpp_helpers.cc index 96950e52..172acedd 100644 --- a/src/google/protobuf/compiler/cpp/cpp_helpers.cc +++ b/src/google/protobuf/compiler/cpp/cpp_helpers.cc @@ -752,7 +752,7 @@ bool UsingImplicitWeakFields(const FileDescriptor* file, bool IsImplicitWeakField(const FieldDescriptor* field, const Options& options) { return UsingImplicitWeakFields(field->file(), options) && field->type() == FieldDescriptor::TYPE_MESSAGE && - !field->is_required() && !field->is_repeated() && !field->is_map() && + !field->is_required() && !field->is_map() && field->containing_oneof() == NULL; } |