AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Remove legacy_enum_values flag for GA.

Browse Source
This commit is contained in:
Jon Skeet 2016-07-27 09:12:48 +01:00 committed by Jisi Liu
parent 7c9c314ca7
commit 86535a1ce7
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/google/protobuf/compiler/csharp/csharp_enum.cc
View File

@ -68,9 +68,7 @@ void EnumGenerator::Generate(io::Printer* printer) {
for (int i = 0; i < descriptor_->value_count(); i++) { for (int i = 0; i < descriptor_->value_count(); i++) {
WriteEnumValueDocComment(printer, descriptor_->value(i)); WriteEnumValueDocComment(printer, descriptor_->value(i));
string original_name = descriptor_->value(i)->name(); string original_name = descriptor_->value(i)->name();
string name = options()->legacy_enum_values string name = GetEnumValueName(descriptor_->name(), descriptor_->value(i)->name());
? descriptor_->value(i)->name()
: GetEnumValueName(descriptor_->name(), descriptor_->value(i)->name());
// Make sure we don't get any duplicate names due to prefix removal. // Make sure we don't get any duplicate names due to prefix removal.
while (!used_names.insert(name).second) { while (!used_names.insert(name).second) {
// It's possible we'll end up giving this warning multiple times, but that's better than not at all. // It's possible we'll end up giving this warning multiple times, but that's better than not at all.

3
src/google/protobuf/compiler/csharp/csharp_generator.cc
View File

@ -83,9 +83,6 @@ bool Generator::Generate(
cli_options.base_namespace_specified = true; cli_options.base_namespace_specified = true;
} else if (options[i].first == "internal_access") { } else if (options[i].first == "internal_access") {
cli_options.internal_access = true; cli_options.internal_access = true;
} else if (options[i].first == "legacy_enum_values") {
// TODO: Remove this before final release
cli_options.legacy_enum_values = true;
} else { } else {
*error = "Unknown generator option: " + options[i].first; *error = "Unknown generator option: " + options[i].first;
return false; return false;

9
src/google/protobuf/compiler/csharp/csharp_options.h
View File

@ -45,8 +45,7 @@ struct Options {
file_extension(".cs"), file_extension(".cs"),
base_namespace(""), base_namespace(""),
base_namespace_specified(false), base_namespace_specified(false),
internal_access(false), internal_access(false) {
legacy_enum_values(false) {
} }
// Extension of the generated file. Defaults to ".cs" // Extension of the generated file. Defaults to ".cs"
string file_extension; string file_extension;
@ -69,12 +68,6 @@ struct Options {
// Whether the generated classes should have accessibility level of "internal". // Whether the generated classes should have accessibility level of "internal".
// Defaults to false that generates "public" classes. // Defaults to false that generates "public" classes.
bool internal_access; bool internal_access;
// By default, C# codegen now uses PascalCased enum values names, after
// removing the enum type name as a prefix (if it *is* a prefix of the value).
// Setting this option reverts to the previous behavior of just copying the
// value name specified in the .proto file, allowing gradual migration.
// This option will be removed before final release.
bool legacy_enum_values;
}; };
} // namespace csharp } // namespace csharp