[cleanup] Suppress MSVC Warning in Generated C++ Files (protocolbuffe…

…rs#10353) * Add static_cast so that generated files do not emit warning * Address PR feedback * Updates after running generate_descriptor_proto.sh Co-authored-by: Tushar Bhatnagar <[email protected]> Co-authored-by: Adam Cozzette <[email protected]>
mkruskal-google · Aug 12, 2022 · caff3c2 · caff3c2
1 parent 043cb56
commit caff3c2
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
diff --git a/src/google/protobuf/compiler/cpp/parse_function_generator.cc b/src/google/protobuf/compiler/cpp/parse_function_generator.cc
@@ -1102,10 +1102,10 @@ void ParseFunctionGenerator::GenerateFieldBody(
         format.Set("enum_type",
                    QualifiedClassName(field->enum_type(), options_));
         format(
-            "$uint64$ val = ::$proto_ns$::internal::ReadVarint64(&ptr);\n"
+            "$uint32$ val = ::$proto_ns$::internal::ReadVarint32(&ptr);\n"
             "CHK_(ptr);\n");
         if (!internal::cpp::HasPreservingUnknownEnumSemantics(field)) {
-          format("if (PROTOBUF_PREDICT_TRUE($enum_type$_IsValid(val))) {\n");
+          format("if (PROTOBUF_PREDICT_TRUE($enum_type$_IsValid(static_cast<int>(val)))) {\n");
           format.Indent();
         }
         format("$msg$_internal_$put_field$(static_cast<$enum_type$>(val));\n");

diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc