third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc

Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc
diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc
index c42f162794dad305084ed9513fc28a41682aecb0..e4fce4617b8320d7656d6ed280f2d42c192ca943 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc
+++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc
@@ -92,7 +92,7 @@ ExtensionGenerator::ExtensionGenerator(const FieldDescriptor* descriptor,
 ExtensionGenerator::~ExtensionGenerator() {}
 
 void ExtensionGenerator::GenerateDeclaration(io::Printer* printer) {
-  map<string, string> vars;
+  std::map<string, string> vars;
   vars["extendee"     ] = ExtendeeClassName(descriptor_);
   vars["number"       ] = SimpleItoa(descriptor_->number());
   vars["type_traits"  ] = type_traits_;
@@ -128,7 +128,7 @@ void ExtensionGenerator::GenerateDefinition(io::Printer* printer) {
     ClassName(descriptor_->extension_scope(), false) + "::";
   string name = scope + descriptor_->name();
 
-  map<string, string> vars;
+  std::map<string, string> vars;
   vars["extendee"     ] = ExtendeeClassName(descriptor_);
   vars["type_traits"  ] = type_traits_;
   vars["name"         ] = name;
@@ -167,7 +167,7 @@ void ExtensionGenerator::GenerateDefinition(io::Printer* printer) {
 }
 
 void ExtensionGenerator::GenerateRegistration(io::Printer* printer) {
-  map<string, string> vars;
+  std::map<string, string> vars;
   vars["extendee"   ] = ExtendeeClassName(descriptor_);
   vars["number"     ] = SimpleItoa(descriptor_->number());
   vars["field_type" ] = SimpleItoa(static_cast<int>(descriptor_->type()));
@@ -178,28 +178,30 @@ void ExtensionGenerator::GenerateRegistration(io::Printer* printer) {
 
   switch (descriptor_->cpp_type()) {
     case FieldDescriptor::CPPTYPE_ENUM:
-      printer->Print(vars,
-        "::google::protobuf::internal::ExtensionSet::RegisterEnumExtension(\n"
-        "  &$extendee$::default_instance(),\n"
-        "  $number$, $field_type$, $is_repeated$, $is_packed$,\n");
+      printer->Print(
+          vars,
+          "::google::protobuf::internal::ExtensionSet::RegisterEnumExtension(\n"
+          "  $extendee$::internal_default_instance(),\n"
+          "  $number$, $field_type$, $is_repeated$, $is_packed$,\n");
       printer->Print(
         "  &$type$_IsValid);\n",
         "type", ClassName(descriptor_->enum_type(), true));
       break;
     case FieldDescriptor::CPPTYPE_MESSAGE:
-      printer->Print(vars,
-        "::google::protobuf::internal::ExtensionSet::RegisterMessageExtension(\n"
-        "  &$extendee$::default_instance(),\n"
-        "  $number$, $field_type$, $is_repeated$, $is_packed$,\n");
       printer->Print(
-        "  &$type$::default_instance());\n",
-        "type", ClassName(descriptor_->message_type(), true));
+          vars,
+          "::google::protobuf::internal::ExtensionSet::RegisterMessageExtension(\n"
+          "  $extendee$::internal_default_instance(),\n"
+          "  $number$, $field_type$, $is_repeated$, $is_packed$,\n");
+      printer->Print("  $type$::internal_default_instance());\n", "type",
+                     ClassName(descriptor_->message_type(), true));
       break;
     default:
-      printer->Print(vars,
-        "::google::protobuf::internal::ExtensionSet::RegisterExtension(\n"
-        "  &$extendee$::default_instance(),\n"
-        "  $number$, $field_type$, $is_repeated$, $is_packed$);\n");
+      printer->Print(
+          vars,
+          "::google::protobuf::internal::ExtensionSet::RegisterExtension(\n"
+          "  $extendee$::internal_default_instance(),\n"
+          "  $number$, $field_type$, $is_repeated$, $is_packed$);\n");
       break;
   }
 }