Index: third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.cc |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.cc |
index 96815920a67a0b34be7008b575a47903cb5cbe00..c22da8d77d4ca62487a3940778d94d615bcae86f 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.cc |
@@ -61,11 +61,10 @@ bool EnumHasCustomOptions(const EnumDescriptor* descriptor) { |
} // namespace |
EnumLiteGenerator::EnumLiteGenerator(const EnumDescriptor* descriptor, |
- bool immutable_api, Context* context) |
- : descriptor_(descriptor), |
- immutable_api_(immutable_api), |
- context_(context), |
- name_resolver_(context->GetNameResolver()) { |
+ bool immutable_api, |
+ Context* context) |
+ : descriptor_(descriptor), immutable_api_(immutable_api), |
+ name_resolver_(context->GetNameResolver()) { |
for (int i = 0; i < descriptor_->value_count(); i++) { |
const EnumValueDescriptor* value = descriptor_->value(i); |
const EnumValueDescriptor* canonical_value = |
@@ -86,16 +85,14 @@ EnumLiteGenerator::~EnumLiteGenerator() {} |
void EnumLiteGenerator::Generate(io::Printer* printer) { |
WriteEnumDocComment(printer, descriptor_); |
- MaybePrintGeneratedAnnotation(context_, printer, descriptor_, immutable_api_); |
printer->Print( |
- "public enum $classname$\n" |
- " implements com.google.protobuf.Internal.EnumLite {\n", |
- "classname", descriptor_->name()); |
- printer->Annotate("classname", descriptor_); |
+ "public enum $classname$\n" |
+ " implements com.google.protobuf.Internal.EnumLite {\n", |
+ "classname", descriptor_->name()); |
printer->Indent(); |
for (int i = 0; i < canonical_values_.size(); i++) { |
- std::map<string, string> vars; |
+ map<string, string> vars; |
vars["name"] = canonical_values_[i]->name(); |
vars["number"] = SimpleItoa(canonical_values_[i]->number()); |
WriteEnumValueDocComment(printer, canonical_values_[i]); |
@@ -117,7 +114,7 @@ void EnumLiteGenerator::Generate(io::Printer* printer) { |
// ----------------------------------------------------------------- |
for (int i = 0; i < aliases_.size(); i++) { |
- std::map<string, string> vars; |
+ map<string, string> vars; |
vars["classname"] = descriptor_->name(); |
vars["name"] = aliases_[i].value->name(); |
vars["canonical_name"] = aliases_[i].canonical_value->name(); |
@@ -127,7 +124,7 @@ void EnumLiteGenerator::Generate(io::Printer* printer) { |
} |
for (int i = 0; i < descriptor_->value_count(); i++) { |
- std::map<string, string> vars; |
+ map<string, string> vars; |
vars["name"] = descriptor_->value(i)->name(); |
vars["number"] = SimpleItoa(descriptor_->value(i)->number()); |
WriteEnumValueDocComment(printer, descriptor_->value(i)); |