From cc8ca5b6a5478b40546d4206392eb1471454460d Mon Sep 17 00:00:00 2001
From: Bo Yang <teboring@google.com>
Date: Mon, 19 Sep 2016 13:45:07 -0700
Subject: Integrate internal changes

---
 src/google/protobuf/compiler/cpp/cpp_map_field.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/google/protobuf/compiler/cpp/cpp_map_field.cc')

diff --git a/src/google/protobuf/compiler/cpp/cpp_map_field.cc b/src/google/protobuf/compiler/cpp/cpp_map_field.cc
index 0588e34e..31ac9ca7 100644
--- a/src/google/protobuf/compiler/cpp/cpp_map_field.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_map_field.cc
@@ -399,7 +399,8 @@ void MapFieldGenerator::GenerateSerializeWithCachedSizes(
 void MapFieldGenerator::
 GenerateByteSize(io::Printer* printer) const {
   printer->Print(variables_,
-      "total_size += $tag_size$ * this->$name$_size();\n"
+      "total_size += $tag_size$ *\n"
+      "    ::google::protobuf::internal::FromIntSize(this->$name$_size());\n"
       "{\n"
       "  ::google::protobuf::scoped_ptr<$map_classname$> entry;\n"
       "  for (::google::protobuf::Map< $key_cpp$, $val_cpp$ >::const_iterator\n"
-- 
cgit v1.2.3