updated protobuf to 3.18.1

2021-10-10 20:51:05 +02:00
parent ea460b1aaf
commit 7d69203486
69 changed files with 6374 additions and 3669 deletions
--- a/external/include/google/protobuf/io/tokenizer.h
+++ b/external/include/google/protobuf/io/tokenizer.h
@@ -217,8 +217,8 @@ class PROTOBUF_EXPORT Tokenizer {
  // result.  If the text is not from a Token of type TYPE_INTEGER originally
  // parsed by a Tokenizer, the result is undefined (possibly an assert
  // failure).
-  static bool ParseInteger(const std::string& text, uint64 max_value,
-                           uint64* output);
+  static bool ParseInteger(const std::string& text, uint64_t max_value,
+                           uint64_t* output);

  // Options ---------------------------------------------------------