diff --git a/src/google/protobuf/compiler/cpp/file.cc b/src/google/protobuf/compiler/cpp/file.cc index 8e042937cd..9e7d9e58ed 100644 --- a/src/google/protobuf/compiler/cpp/file.cc +++ b/src/google/protobuf/compiler/cpp/file.cc @@ -163,8 +163,9 @@ void FileGenerator::GenerateFile(io::Printer* p, GeneratedFileType file_type, auto v = p->WithVars(FileVars(file_, options_)); auto guard = IncludeGuard(file_, file_type, options_); p->Print( - "// Generated by the protocol buffer compiler. DO NOT EDIT! DO NOT " - "SUBMIT!\n" + "// Generated by the protocol buffer compiler. DO NOT EDIT!\n" + "// NO CHECKED-IN PROTOBUF " + "GENCODE\n" "// source: $filename$\n"); if (options_.opensource_runtime) { p->Print("// Protobuf C++ Version: $protobuf_cpp_version$\n", @@ -465,8 +466,9 @@ void FileGenerator::GenerateSourceIncludes(io::Printer* p) { absl::StrAppend(&target_basename, options_.proto_h ? ".proto.h" : ".pb.h"); p->Print( - "// Generated by the protocol buffer compiler. DO NOT EDIT! DO NOT " - "SUBMIT!\n" + "// Generated by the protocol buffer compiler. DO NOT EDIT!\n" + "// NO CHECKED-IN PROTOBUF " + "GENCODE\n" "// source: $filename$\n"); if (options_.opensource_runtime) { p->Print("// Protobuf C++ Version: $protobuf_cpp_version$\n", diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc index 6d38f4e695..785788ce71 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.cc +++ b/src/google/protobuf/compiler/java/java_features.pb.cc @@ -1,4 +1,5 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! DO NOT SUBMIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/java/java_features.proto // Protobuf C++ Version: 5.27.0-dev diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index 315b94a143..d41c7b146c 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.h +++ b/src/google/protobuf/compiler/java/java_features.pb.h @@ -1,4 +1,5 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! DO NOT SUBMIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/java/java_features.proto // Protobuf C++ Version: 5.27.0-dev diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index 68817feaf9..ced93f9fc1 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -1,4 +1,5 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! DO NOT SUBMIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/plugin.proto // Protobuf C++ Version: 5.27.0-dev diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 9bb504bc6e..a6a7a5c522 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -1,4 +1,5 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! DO NOT SUBMIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/plugin.proto // Protobuf C++ Version: 5.27.0-dev diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index b7d86d343a..5f97465e72 100644 --- a/src/google/protobuf/cpp_features.pb.cc +++ b/src/google/protobuf/cpp_features.pb.cc @@ -1,4 +1,5 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! DO NOT SUBMIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_features.proto // Protobuf C++ Version: 5.27.0-dev diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index 2f813995d3..289625b158 100644 --- a/src/google/protobuf/cpp_features.pb.h +++ b/src/google/protobuf/cpp_features.pb.h @@ -1,4 +1,5 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! DO NOT SUBMIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_features.proto // Protobuf C++ Version: 5.27.0-dev diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 487f8a7d83..66e3ab2ee1 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -1,4 +1,5 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! DO NOT SUBMIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/descriptor.proto // Protobuf C++ Version: 5.27.0-dev diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index c967b25841..b9c4e270bf 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -1,4 +1,5 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! DO NOT SUBMIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/descriptor.proto // Protobuf C++ Version: 5.27.0-dev diff --git a/src/google/protobuf/editions/golden/compare_cpp_codegen_failure.xml b/src/google/protobuf/editions/golden/compare_cpp_codegen_failure.xml index 4c56e0c35e..58c8c4e498 100644 --- a/src/google/protobuf/editions/golden/compare_cpp_codegen_failure.xml +++ b/src/google/protobuf/editions/golden/compare_cpp_codegen_failure.xml @@ -2,10 +2,10 @@ - + - +