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/zero_copy_stream_impl.h
+++ b/external/include/google/protobuf/io/zero_copy_stream_impl.h
@@ -311,7 +311,7 @@ class PROTOBUF_EXPORT ConcatenatingInputStream : public ZeroCopyInputStream {
  // decremented.
  ZeroCopyInputStream* const* streams_;
  int stream_count_;
-  int64 bytes_retired_;  // Bytes read from previous streams.
+  int64_t bytes_retired_;  // Bytes read from previous streams.

  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ConcatenatingInputStream);
 };