diff --git a/src/google/protobuf/compiler/cpp/field_generators/message_field.cc b/src/google/protobuf/compiler/cpp/field_generators/message_field.cc index 32edc0e3d0..8ceb1e0c26 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/message_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/message_field.cc @@ -704,10 +704,9 @@ void OneofMessage::GenerateConstructorCode(io::Printer* p) const { void OneofMessage::GenerateIsInitialized(io::Printer* p) const { if (!has_required_) return; - p->Emit( - "if ($has_field$) {\n" - " if (!$field_$->IsInitialized()) return false;\n" - "}\n"); + p->Emit(R"cc( + if ($has_field$ && !$field_$->IsInitialized()) return false; + )cc"); } class RepeatedMessage : public FieldGeneratorBase {