aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xiaofeng@google.com>2015-12-09 13:40:38 -0800
committerFeng Xiao <xiaofeng@google.com>2015-12-09 13:40:38 -0800
commit723010dc542da6dce10d795ec8afcf4bc2de99e6 (patch)
tree6f4765b0837392b773f3162c12e377fb08aa0e68
parent27c522940b6ea134d206416db5c9c47b22b05683 (diff)
parentf42a68df5418a032921bd10d6d8551571a2598b4 (diff)
downloadprotobuf-723010dc542da6dce10d795ec8afcf4bc2de99e6.tar.gz
protobuf-723010dc542da6dce10d795ec8afcf4bc2de99e6.tar.bz2
protobuf-723010dc542da6dce10d795ec8afcf4bc2de99e6.zip
Merge pull request #1033 from c0nk/wip-implicit-cast-fix
Fix narrowing implicit cast in generated message [NFC]
-rw-r--r--src/google/protobuf/compiler/cpp/cpp_message.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc
index 8c0bfab7..af409c29 100644
--- a/src/google/protobuf/compiler/cpp/cpp_message.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_message.cc
@@ -3364,7 +3364,7 @@ GenerateSerializeWithCachedSizesBody(io::Printer* printer, bool to_array) {
} else {
printer->Print(
"output->WriteRaw(unknown_fields().data(),\n"
- " unknown_fields().size());\n");
+ " static_cast<int>(unknown_fields().size()));\n");
}
}
}