From e3ebf0c7e130f09f9d76d5aeb13a8845a2d83344 Mon Sep 17 00:00:00 2001 From: Jan-Gerd Tenberge Date: Thu, 28 Nov 2019 17:53:16 +0100 Subject: [PATCH] Add explicit cast to silence clang warning Clang currently displays an error if source files generated with protoc are compiled with -Wcomma. This change fixes this as suggested by the compiler itself. --- src/google/protobuf/compiler/cpp/cpp_file.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/google/protobuf/compiler/cpp/cpp_file.cc index 45fd30871c..14b519ade0 100644 --- a/src/google/protobuf/compiler/cpp/cpp_file.cc +++ b/src/google/protobuf/compiler/cpp/cpp_file.cc @@ -918,8 +918,8 @@ void FileGenerator::GenerateReflectionInitializationCode(io::Printer* printer) { if (file_->name() != "net/proto2/proto/descriptor.proto") { format( "// Force running AddDescriptors() at dynamic initialization time.\n" - "static bool $1$ = (" - " ::$proto_ns$::internal::AddDescriptors(&$desc_table$), true);\n", + "static bool $1$ = (static_cast(" + "::$proto_ns$::internal::AddDescriptors(&$desc_table$)), true);\n", UniqueName("dynamic_init_dummy", file_, options_)); } }