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

third_party/protobuf/src/google/protobuf/io/printer.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 52 matching lines @@
       annotation_collector_(annotation_collector) {}
 
 Printer::~Printer() {
   // Only BackUp() if we have called Next() at least once and never failed.
   if (buffer_size_ > 0 && !failed_) {
     output_->BackUp(buffer_size_);
   }
 }
 
 bool Printer::GetSubstitutionRange(const char* varname,
-                                   std::pair<size_t, size_t>* range) {
-  std::map<string, std::pair<size_t, size_t> >::const_iterator iter =
+                                   pair<size_t, size_t>* range) {
+  map<string, pair<size_t, size_t> >::const_iterator iter =
       substitutions_.find(varname);
   if (iter == substitutions_.end()) {
     GOOGLE_LOG(DFATAL) << " Undefined variable in annotation: " << varname;
     return false;
   }
   if (iter->second.first > iter->second.second) {
     GOOGLE_LOG(DFATAL) << " Variable used for annotation used multiple times: "
                 << varname;
     return false;
   }
   *range = iter->second;
   return true;
 }
 
 void Printer::Annotate(const char* begin_varname, const char* end_varname,
-                       const string& file_path, const std::vector<int>& path) {
+                       const string& file_path, const vector<int>& path) {
   if (annotation_collector_ == NULL) {
     // Can't generate signatures with this Printer.
     return;
   }
-  std::pair<size_t, size_t> begin, end;
+  pair<size_t, size_t> begin, end;
   if (!GetSubstitutionRange(begin_varname, &begin) ||
       !GetSubstitutionRange(end_varname, &end)) {
     return;
   }
   if (begin.first > end.second) {
     GOOGLE_LOG(DFATAL) << "  Annotation has negative length from " << begin_varname
                 << " to " << end_varname;
   } else {
     annotation_collector_->AddAnnotation(begin.first, end.second, file_path,
                                          path);
   }
 }
 
-void Printer::Print(const std::map<string, string>& variables,
-                    const char* text) {
+void Printer::Print(const map<string, string>& variables, const char* text) {
   int size = strlen(text);
   int pos = 0;  // The number of bytes we've written so far.
   substitutions_.clear();
 
   for (int i = 0; i < size; i++) {
     if (text[i] == '\n') {
       // Saw newline.  If there is more text, we may need to insert an indent
       // here.  So, write what we have so far, including the '\n'.
       WriteRaw(text + pos, i - pos + 1);
       pos = i + 1;
@@ skipping 16 matching lines @@
         end = text + pos;
       }
       int endpos = end - text;
 
       string varname(text + pos, endpos - pos);
       if (varname.empty()) {
         // Two delimiters in a row reduce to a literal delimiter character.
         WriteRaw(&variable_delimiter_, 1);
       } else {
         // Replace with the variable's value.
-        std::map<string, string>::const_iterator iter = variables.find(varname);
+        map<string, string>::const_iterator iter = variables.find(varname);
         if (iter == variables.end()) {
           GOOGLE_LOG(DFATAL) << " Undefined variable: " << varname;
         } else {
           size_t begin = offset_;
           WriteRaw(iter->second.data(), iter->second.size());
-          std::pair<std::map<string, std::pair<size_t, size_t> >::iterator,
-                    bool>
-              inserted = substitutions_.insert(
+          pair<map<string, pair<size_t, size_t> >::iterator, bool> inserted =
+              substitutions_.insert(
                   std::make_pair(varname, std::make_pair(begin, offset_)));
           if (!inserted.second) {
             // This variable was used multiple times.  Make its span have
             // negative length so we can detect it if it gets used in an
             // annotation.
             inserted.first->second = std::make_pair(1, 0);
           }
         }
       }
 
       // Advance past this variable.
       i = endpos;
       pos = endpos + 1;
     }
   }
 
   // Write the rest.
   WriteRaw(text + pos, size - pos);
 }
 
 void Printer::Print(const char* text) {
-  static std::map<string, string> empty;
+  static map<string, string> empty;
   Print(empty, text);
 }
 
 void Printer::Print(const char* text,
                     const char* variable, const string& value) {
-  std::map<string, string> vars;
+  map<string, string> vars;
   vars[variable] = value;
   Print(vars, text);
 }
 
 void Printer::Print(const char* text,
                     const char* variable1, const string& value1,
                     const char* variable2, const string& value2) {
-  std::map<string, string> vars;
+  map<string, string> vars;
   vars[variable1] = value1;
   vars[variable2] = value2;
   Print(vars, text);
 }
 
 void Printer::Print(const char* text,
                     const char* variable1, const string& value1,
                     const char* variable2, const string& value2,
                     const char* variable3, const string& value3) {
-  std::map<string, string> vars;
+  map<string, string> vars;
   vars[variable1] = value1;
   vars[variable2] = value2;
   vars[variable3] = value3;
   Print(vars, text);
 }
 
 void Printer::Print(const char* text,
                     const char* variable1, const string& value1,
                     const char* variable2, const string& value2,
                     const char* variable3, const string& value3,
                     const char* variable4, const string& value4) {
-  std::map<string, string> vars;
+  map<string, string> vars;
   vars[variable1] = value1;
   vars[variable2] = value2;
   vars[variable3] = value3;
   vars[variable4] = value4;
   Print(vars, text);
 }
 
 void Printer::Print(const char* text,
                     const char* variable1, const string& value1,
                     const char* variable2, const string& value2,
                     const char* variable3, const string& value3,
                     const char* variable4, const string& value4,
                     const char* variable5, const string& value5) {
-  std::map<string, string> vars;
+  map<string, string> vars;
   vars[variable1] = value1;
   vars[variable2] = value2;
   vars[variable3] = value3;
   vars[variable4] = value4;
   vars[variable5] = value5;
   Print(vars, text);
 }
 
 void Printer::Print(const char* text,
                     const char* variable1, const string& value1,
                     const char* variable2, const string& value2,
                     const char* variable3, const string& value3,
                     const char* variable4, const string& value4,
                     const char* variable5, const string& value5,
                     const char* variable6, const string& value6) {
-  std::map<string, string> vars;
+  map<string, string> vars;
   vars[variable1] = value1;
   vars[variable2] = value2;
   vars[variable3] = value3;
   vars[variable4] = value4;
   vars[variable5] = value5;
   vars[variable6] = value6;
   Print(vars, text);
 }
 
 void Printer::Print(const char* text,
                     const char* variable1, const string& value1,
                     const char* variable2, const string& value2,
                     const char* variable3, const string& value3,
                     const char* variable4, const string& value4,
                     const char* variable5, const string& value5,
                     const char* variable6, const string& value6,
                     const char* variable7, const string& value7) {
-  std::map<string, string> vars;
+  map<string, string> vars;
   vars[variable1] = value1;
   vars[variable2] = value2;
   vars[variable3] = value3;
   vars[variable4] = value4;
   vars[variable5] = value5;
   vars[variable6] = value6;
   vars[variable7] = value7;
   Print(vars, text);
 }
 
 void Printer::Print(const char* text,
                     const char* variable1, const string& value1,
                     const char* variable2, const string& value2,
                     const char* variable3, const string& value3,
                     const char* variable4, const string& value4,
                     const char* variable5, const string& value5,
                     const char* variable6, const string& value6,
                     const char* variable7, const string& value7,
                     const char* variable8, const string& value8) {
-  std::map<string, string> vars;
+  map<string, string> vars;
   vars[variable1] = value1;
   vars[variable2] = value2;
   vars[variable3] = value3;
   vars[variable4] = value4;
   vars[variable5] = value5;
   vars[variable6] = value6;
   vars[variable7] = value7;
   vars[variable8] = value8;
   Print(vars, text);
 }
@@ skipping 47 matching lines @@
   // Buffer is big enough to receive the data; copy it.
   memcpy(buffer_, data, size);
   buffer_ += size;
   buffer_size_ -= size;
   offset_ += size;
 }
 
 }  // namespace io
 }  // namespace protobuf
 }  // namespace google