From 6f0f382d5641b8632a05c3d27174e475f76f3f31 Mon Sep 17 00:00:00 2001 From: Christian Maurer Date: Tue, 15 Oct 2019 13:16:49 +0200 Subject: [PATCH] c++ remove conversion warning in MapEntryFuncs::ByteSizeLong --- src/google/protobuf/map_entry_lite.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/map_entry_lite.h b/src/google/protobuf/map_entry_lite.h index 4668c5b42e53..b3f482ed1967 100644 --- a/src/google/protobuf/map_entry_lite.h +++ b/src/google/protobuf/map_entry_lite.h @@ -128,7 +128,7 @@ struct MapEntryFuncs { // Tags for key and value will both be one byte (field numbers 1 and 2). size_t inner_length = 2 + KeyTypeHandler::ByteSize(key) + ValueTypeHandler::ByteSize(value); - return inner_length + io::CodedOutputStream::VarintSize32(inner_length); + return inner_length + io::CodedOutputStream::VarintSize32(static_cast(inner_length)); } static int GetCachedSize(const Key& key, const Value& value) {