third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/compiler/parser_unittest.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 2200 matching lines @@
                int index) {
     return HasSpan('\0', '\0', descriptor_proto, field_name, index);
   }
 
   bool HasSpanWithComment(
       char start_marker, char end_marker, const Message& descriptor_proto,
       const FieldDescriptor* field, int index,
       const char* expected_leading_comments,
       const char* expected_trailing_comments,
       const char* expected_leading_detached_comments) {
-    pair<SpanMap::iterator, SpanMap::iterator> range =
+    std::pair<SpanMap::iterator, SpanMap::iterator> range =
         spans_.equal_range(SpanKey(descriptor_proto, field, index));
 
     if (start_marker == '\0') {
       if (range.first == range.second) {
         return false;
       } else {
         spans_.erase(range.first);
         return true;
       }
     } else {
-      pair<int, int> start_pos = FindOrDie(markers_, start_marker);
-      pair<int, int> end_pos = FindOrDie(markers_, end_marker);
+      std::pair<int, int> start_pos = FindOrDie(markers_, start_marker);
+      std::pair<int, int> end_pos = FindOrDie(markers_, end_marker);
 
       RepeatedField<int> expected_span;
       expected_span.Add(start_pos.first);
       expected_span.Add(start_pos.second);
       if (end_pos.first != start_pos.first) {
         expected_span.Add(end_pos.first);
       }
       expected_span.Add(end_pos.second);
 
       for (SpanMap::iterator iter = range.first; iter != range.second; ++iter) {
@@ skipping 44 matching lines @@
 
     inline bool operator<(const SpanKey& other) const {
       if (descriptor_proto < other.descriptor_proto) return true;
       if (descriptor_proto > other.descriptor_proto) return false;
       if (field < other.field) return true;
       if (field > other.field) return false;
       return index < other.index;
     }
   };
 
-  typedef multimap<SpanKey, const SourceCodeInfo::Location*> SpanMap;
+  typedef std::multimap<SpanKey, const SourceCodeInfo::Location*> SpanMap;
   SpanMap spans_;
-  map<char, pair<int, int> > markers_;
+  std::map<char, std::pair<int, int> > markers_;
   string text_without_markers_;
 
   void ExtractMarkers(const char* text) {
     markers_.clear();
     text_without_markers_.clear();
     int line = 0;
     int column = 0;
     while (*text != '\0') {
       if (*text == '$') {
         ++text;
@@ skipping 837 matching lines @@
   EXPECT_TRUE(HasSpan(bar_int, "number"));
 }
 
 // ===================================================================
 
 }  // anonymous namespace
 
 }  // namespace compiler
 }  // namespace protobuf
 }  // namespace google