third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/io/tokenizer.h

 // 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 173 matching lines @@
   //   // because there are blank lines separating it from both.
   //
   //   optional string corge = 5;
   //   /* Block comment attached
   //    * to corge.  Leading asterisks
   //    * will be removed. */
   //   /* Block comment attached to
   //    * grault. */
   //   optional int32 grault = 6;
   bool NextWithComments(string* prev_trailing_comments,
-                        vector<string>* detached_comments,
+                        std::vector<string>* detached_comments,
                         string* next_leading_comments);
 
   // Parse helpers ---------------------------------------------------
 
   // Parses a TYPE_FLOAT token.  This never fails, so long as the text actually
   // comes from a TYPE_FLOAT token parsed by Tokenizer.  If it doesn't, the
   // result is undefined (possibly an assert failure).
   static double ParseFloat(const string& text);
 
   // Parses a TYPE_STRING token.  This never fails, so long as the text actually
@@ skipping 117 matching lines @@
   // in order to decide what kind of token is being read.
 
   // Read and consume a string, ending when the given delimiter is
   // consumed.
   void ConsumeString(char delimiter);
 
   // Read and consume a number, returning TYPE_FLOAT or TYPE_INTEGER
   // depending on what was read.  This needs to know if the first
   // character was a zero in order to correctly recognize hex and octal
   // numbers.
-  // It also needs to know if the first characted was a . to parse floating
+  // It also needs to know if the first character was a . to parse floating
   // point correctly.
   TokenType ConsumeNumber(bool started_with_zero, bool started_with_dot);
 
   // Consume the rest of a line.
   void ConsumeLineComment(string* content);
   // Consume until "*/".
   void ConsumeBlockComment(string* content);
 
   enum NextCommentStatus {
     // Started a line comment.
@@ skipping 59 matching lines @@
 inline void Tokenizer::ParseString(const string& text, string* output) {
   output->clear();
   ParseStringAppend(text, output);
 }
 
 }  // namespace io
 }  // namespace protobuf
 
 }  // namespace google
 #endif  // GOOGLE_PROTOBUF_IO_TOKENIZER_H__