third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.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 74 matching lines @@
       type_traits_.append("PrimitiveTypeTraits< ");
       type_traits_.append(PrimitiveTypeName(descriptor_->cpp_type()));
       type_traits_.append(" >");
       break;
   }
 }
 
 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_;
   vars["name"         ] = descriptor_->name();
   vars["field_type"   ] = SimpleItoa(static_cast<int>(descriptor_->type()));
   vars["packed"       ] = descriptor_->options().packed() ? "true" : "false";
   vars["constant_name"] = FieldConstantName(descriptor_);
 
   // If this is a class member, it needs to be declared "static".  Otherwise,
   // it needs to be "extern".  In the latter case, it also needs the DLL
@@ skipping 15 matching lines @@
     );
 
 }
 
 void ExtensionGenerator::GenerateDefinition(io::Printer* printer) {
   // If this is a class member, it needs to be declared in its class scope.
   string scope = (descriptor_->extension_scope() == NULL) ? "" :
     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;
   vars["constant_name"] = FieldConstantName(descriptor_);
   vars["default"      ] = DefaultValue(descriptor_);
   vars["field_type"   ] = SimpleItoa(static_cast<int>(descriptor_->type()));
   vars["packed"       ] = descriptor_->options().packed() ? "true" : "false";
   vars["scope"        ] = scope;
 
   if (descriptor_->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
@@ skipping 18 matching lines @@
       "#endif\n");
   }
 
   printer->Print(vars,
     "::google::protobuf::internal::ExtensionIdentifier< $extendee$,\n"
     "    ::google::protobuf::internal::$type_traits$, $field_type$, $packed$ >\n"
     "  $name$($constant_name$, $default$);\n");
 }
 
 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()));
   vars["is_repeated"] = descriptor_->is_repeated() ? "true" : "false";
   vars["is_packed"  ] = (descriptor_->is_repeated() &&
                          descriptor_->options().packed())
                         ? "true" : "false";
 
   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;
   }
 }
 
 }  // namespace cpp
 }  // namespace compiler
 }  // namespace protobuf
 }  // namespace google