commit 4773c6fafff3381a238f214c68130c7bfe02400d
author Gabe Black <gabeblack@google.com> Tue Apr 28 23:40:17 2020 -0700
committer Tommaso Marinelli <tommarin@ucm.es> Wed Apr 29 21:46:11 2020 +0000
tree 5e723d58503d7cbace11d8b33ebcd744ccfd84c6
parent cc2f48ccfc2cc87b887baa542c9d0aeee6b8709e

misc: Use the protobuf version to choose between ByteSize(Long).

Older versions of protobuf are apparently still what's provided with
some current versions of some distributions. To avoid breaking the build
on those distributions and to avoid an annoying deprecation warning on
newer systems, check GOOGLE_PROTOBUF_VERSION to choose which to use.

According to the CHANGES.txt file here:

https://github.com/protocolbuffers/protobuf/blob/master/CHANGES.txt

The new ByteSizeLong function was introduced in version 3.1.0 in 2016.

Change-Id: I7f8eeda144bf9556d17d7a0a741996f3137b48b4
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28287
Reviewed-by: Tommaso Marinelli  <tommarin@ucm.es>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/proto/protoio.cc

diff --git a/src/proto/protoio.cc b/src/proto/protoio.cc
index 2efcc27..691d4ee 100644
--- a/src/proto/protoio.cc
+++ b/src/proto/protoio.cc
@@ -87,7 +87,12 @@
     io::CodedOutputStream codedStream(zeroCopyStream);
 
     // Write the size of the message to the stream
-    codedStream.WriteVarint32(msg.ByteSizeLong());
+#   if GOOGLE_PROTOBUF_VERSION < 3001000
+        auto msg_size = msg.ByteSize();
+#   else
+        auto msg_size = msg.ByteSizeLong();
+#   endif
+    codedStream.WriteVarint32(msg_size);
 
     // Write the message itself to the stream
     msg.SerializeWithCachedSizes(&codedStream);