third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/io/tokenizer.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 647 matching lines @@
 // Helper class for collecting comments and putting them in the right places.
 //
 // This basically just buffers the most recent comment until it can be decided
 // exactly where that comment should be placed.  When Flush() is called, the
 // current comment goes into either prev_trailing_comments or detached_comments.
 // When the CommentCollector is destroyed, the last buffered comment goes into
 // next_leading_comments.
 class CommentCollector {
  public:
   CommentCollector(string* prev_trailing_comments,
-                   vector<string>* detached_comments,
+                   std::vector<string>* detached_comments,
                    string* next_leading_comments)
       : prev_trailing_comments_(prev_trailing_comments),
         detached_comments_(detached_comments),
         next_leading_comments_(next_leading_comments),
         has_comment_(false),
         is_line_comment_(false),
         can_attach_to_prev_(true) {
     if (prev_trailing_comments != NULL) prev_trailing_comments->clear();
     if (detached_comments != NULL) detached_comments->clear();
     if (next_leading_comments != NULL) next_leading_comments->clear();
@@ skipping 51 matching lines @@
       ClearBuffer();
     }
   }
 
   void DetachFromPrev() {
     can_attach_to_prev_ = false;
   }
 
  private:
   string* prev_trailing_comments_;
-  vector<string>* detached_comments_;
+  std::vector<string>* detached_comments_;
   string* next_leading_comments_;
 
   string comment_buffer_;
 
   // True if any comments were read into comment_buffer_.  This can be true even
   // if comment_buffer_ is empty, namely if the comment was "/**/".
   bool has_comment_;
 
   // Is the comment in the comment buffer a line comment?
   bool is_line_comment_;
 
   // Is it still possible that we could be reading a comment attached to the
   // previous token?
   bool can_attach_to_prev_;
 };
 
 } // namespace
 
 bool Tokenizer::NextWithComments(string* prev_trailing_comments,
-                                 vector<string>* detached_comments,
+                                 std::vector<string>* detached_comments,
                                  string* next_leading_comments) {
   CommentCollector collector(prev_trailing_comments, detached_comments,
                              next_leading_comments);
 
   if (current_.type == TYPE_START) {
     // Ignore unicode byte order mark(BOM) if it appears at the file
     // beginning. Only UTF-8 BOM (0xEF 0xBB 0xBF) is accepted.
     if (TryConsume((char)0xEF)) {
       if (!TryConsume((char)0xBB) || !TryConsume((char)0xBF)) {
         AddError("Proto file starts with 0xEF but not UTF-8 BOM. "
@@ skipping 359 matching lines @@
   if (!Letter::InClass(text.at(0)))
     return false;
   if (!AllInClass<Alphanumeric>(text.substr(1)))
     return false;
   return true;
 }
 
 }  // namespace io
 }  // namespace protobuf
 }  // namespace google