Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 43 matching lines @@
   if (descriptor->options().unknown_fields().field_count() > 0) return true;
   for (int i = 0; i < descriptor->value_count(); ++i) {
     const EnumValueDescriptor* value = descriptor->value(i);
     if (value->options().unknown_fields().field_count() > 0) return true;
   }
   return false;
 }
 }  // 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 =
       descriptor_->FindValueByNumber(value->number());
 
     if (value == canonical_value) {
       canonical_values_.push_back(value);
     } else {
       Alias alias;
       alias.value = value;
       alias.canonical_value = canonical_value;
       aliases_.push_back(alias);
     }
   }
 }
 
 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]);
     if (canonical_values_[i]->options().deprecated()) {
       printer->Print("@java.lang.Deprecated\n");
     }
     printer->Print(vars,
       "$name$($number$),\n");
   }
 
   if (SupportUnknownEnumValue(descriptor_->file())) {
     printer->Print("UNRECOGNIZED(-1),\n");
   }
 
   printer->Print(
     ";\n"
     "\n");
 
   // -----------------------------------------------------------------
 
   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();
     WriteEnumValueDocComment(printer, aliases_[i].value);
     printer->Print(vars,
       "public static final $classname$ $name$ = $canonical_name$;\n");
   }
 
   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));
     printer->Print(vars,
       "public static final int $name$_VALUE = $number$;\n");
   }
   printer->Print("\n");
 
   // -----------------------------------------------------------------
 
@@ skipping 71 matching lines @@
       return false;
     }
   }
   return true;
 }
 
 }  // namespace java
 }  // namespace compiler
 }  // namespace protobuf
 }  // namespace google