From: Sangjung Woo <sangjung.woo@samsung.com>
Date: Fri, 3 Jul 2020 10:11:35 +0000 (+0900)
Subject: [Protobuf] Use ByteSizeLong() instead of deprecated ByteSize()
X-Git-Tag: submit/tizen/20200703.080932^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e06d38d764334b1e728aedf57484889ff3735df;p=platform%2Fcore%2Fsecurity%2Fdevice-certificate-manager.git

[Protobuf] Use ByteSizeLong() instead of deprecated ByteSize()

After bumping up to protobuffer v3.12.3, a below compile-time error
occurs.

* error: 'int google::protobuf::MessageLite::ByteSize() const' is
deprecated: Please use ByteSizeLong() instead [-Werror=deprecated-declarations]

In order to fix this bug, this patch uses the ByteSizeLong() instead of
deprecated ByteSize().

Change-Id: I8bd6c9eb951521af1ae08ff60c7bb81cf8f2c0cd
Signed-off-by: Sangjung Woo <sangjung.woo@samsung.com>
---

diff --git a/shared/protobuf_asio.cpp b/shared/protobuf_asio.cpp
index 9a4155a..bacba2b 100644
--- a/shared/protobuf_asio.cpp
+++ b/shared/protobuf_asio.cpp
@@ -33,7 +33,7 @@ void protobuf_sync_message_serialization::encodeMessage(const google::protobuf::
 	google::protobuf::io::CopyingOutputStreamAdaptor os(this);
 	google::protobuf::io::CodedOutputStream coded_os(&os);
 
-	coded_os.WriteLittleEndian32(message.ByteSize());
+	coded_os.WriteLittleEndian32(message.ByteSizeLong());
 	if(!message.SerializeToCodedStream(&coded_os)) {
 		throw std::invalid_argument("Message serialization error");
 	}
@@ -77,7 +77,7 @@ void protobuf_sync_message_deserialization::decodeMessage(google::protobuf::Mess
 
 void protobuf_async_message_serialization::encodeMessage(const google::protobuf::MessageLite& message)
 {
-	int bufferSize = message.ByteSize();
+	int bufferSize = message.ByteSizeLong();
 	fBuffer.resize(bufferSize + sizeof(uint32_t));
 	google::protobuf::io::CodedOutputStream::WriteLittleEndian32ToArray(bufferSize,
 			reinterpret_cast<google::protobuf::uint8 *>(&fBuffer[0]));