third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/compiler/java/java_message_builder_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 88 matching lines @@
     "    $classname$OrBuilder {\n",
     "classname", name_resolver_->GetImmutableClassName(descriptor_),
     "extra_interfaces", ExtraBuilderInterfaces(descriptor_),
     "extendible",
     descriptor_->extension_range_count() > 0 ? "Extendable" : "");
   printer->Indent();
 
   GenerateCommonBuilderMethods(printer);
 
   // oneof
-  map<string, string> vars;
+  std::map<string, string> vars;
   for (int i = 0; i < descriptor_->oneof_decl_count(); i++) {
     vars["oneof_name"] = context_->GetOneofGeneratorInfo(
         descriptor_->oneof_decl(i))->name;
     vars["oneof_capitalized_name"] = context_->GetOneofGeneratorInfo(
         descriptor_->oneof_decl(i))->capitalized_name;
     vars["oneof_index"] = SimpleItoa(descriptor_->oneof_decl(i)->index());
 
     // oneofCase() and clearOneof()
     printer->Print(vars,
       "public $oneof_capitalized_name$Case\n"
@@ skipping 50 matching lines @@
     "\n",
     "classname", name_resolver_->GetImmutableClassName(descriptor_));
 }
 
 // ===================================================================
 
 }  // namespace java
 }  // namespace compiler
 }  // namespace protobuf
 }  // namespace google