Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated rollback of commit 23aada230b2478c7a07fe7612489eb8e79b9c379. #19692

Merged
merged 2 commits into from
Dec 17, 2024
Merged

Automated rollback of commit 23aada230b2478c7a07fe7612489eb8e79b9c379. #19692

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beb5206
Automated rollback of commit 23aada230b2478c7a07fe7612489eb8e79b9c379.
protobuf-github-bot Dec 16, 2024
10bc850
Update staleness
zhangskz Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/google/protobuf/compiler/cpp/enum.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ absl::flat_hash_map<absl::string_view, std::string> EnumVars(
const EnumValueDescriptor* min, const EnumValueDescriptor* max) {
auto classname = ClassName(enum_, false);
return {
{"DEPRECATED", enum_->options().deprecated() ? "[[deprecated]]" : ""},
{"Enum", std::string(enum_->name())},
{"Enum_", ResolveKeyword(enum_->name())},
{"Msg_Enum", classname},
Expand Down Expand Up @@ -163,7 +162,7 @@ void EnumGenerator::GenerateDefinition(io::Printer* p) {
}},
},
R"cc(
enum $DEPRECATED $$Msg_Enum_annotated$ : int {
enum $Msg_Enum_annotated$ : int {
$values$,
$open_enum_sentinels$,
};
Expand Down
4 changes: 1 addition & 3 deletions src/google/protobuf/compiler/cpp/message.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,6 @@ std::vector<Sub> ClassVars(const Descriptor* desc, Options opts) {
{"Msg", ClassName(desc, false)},
{"pkg::Msg", QualifiedClassName(desc, opts)},
{"pkg.Msg", desc->full_name()},
{"deprecated", desc->options().deprecated() ? "[[deprecated]]" : ""},

// Old-style names, to be removed once all usages are gone in this and
// other files.
Expand Down Expand Up @@ -2058,8 +2057,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
)cc");
}}},
R"cc(
class $dllexport_decl $$deprecated $$classname$ final
: public $superclass$
class $dllexport_decl $$classname$ final : public $superclass$
/* @@protoc_insertion_point(class_definition:$full_name$) */ {
public:
inline $classname$() : $classname$(nullptr) {}
Expand Down
3 changes: 1 addition & 2 deletions src/google/protobuf/compiler/java/java_features.pb.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 4 additions & 8 deletions src/google/protobuf/compiler/plugin.pb.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/google/protobuf/cpp_features.pb.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading