Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.h

 // 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 48 matching lines @@
   ~EnumGenerator();
 
   // Header stuff.
 
   // Fills the name to use when declaring the enum. This is for use when
   // generating other .proto.h files. This code should be placed within the
   // enum's package namespace, but NOT within any class, even for nested
   // enums. A given key in enum_names will map from an enum class name to the
   // EnumDescriptor that was responsible for its inclusion in the map. This can
   // be used to associate the descriptor with the code generated for it.
-  void FillForwardDeclaration(
-      std::map<string, const EnumDescriptor*>* enum_names);
+  void FillForwardDeclaration(map<string, const EnumDescriptor*>* enum_names);
 
   // Generate header code defining the enum.  This code should be placed
   // within the enum's package namespace, but NOT within any class, even for
   // nested enums.
   void GenerateDefinition(io::Printer* printer);
 
   // Generate specialization of GetEnumDescriptor<MyEnum>().
   // Precondition: in ::google::protobuf namespace.
   void GenerateGetEnumDescriptorSpecializations(io::Printer* printer);
 
   // For enums nested within a message, generate code to import all the enum's
   // symbols (e.g. the enum type name, all its values, etc.) into the class's
   // namespace.  This should be placed inside the class definition in the
   // header.
   void GenerateSymbolImports(io::Printer* printer);
 
   // Source file stuff.
 
   // Generate code that initializes the global variable storing the enum's
   // descriptor.
-  void GenerateDescriptorInitializer(io::Printer* printer);
+  void GenerateDescriptorInitializer(io::Printer* printer, int index);
 
   // Generate non-inline methods related to the enum, such as IsValidValue().
   // Goes in the .cc file.
   void GenerateMethods(io::Printer* printer);
 
  private:
   const EnumDescriptor* descriptor_;
   const string classname_;
   const Options& options_;
   // whether to generate the *_ARRAYSIZE constant.
   const bool generate_array_size_;
 
-  int index_in_metadata_;
-
-  friend class FileGenerator;
   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator);
 };
 
 }  // namespace cpp
 }  // namespace compiler
 }  // namespace protobuf
 
 }  // namespace google
 #endif  // GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_H__