diff options
| author | Bo Yang <teboring@google.com> | 2017-06-23 12:56:44 -0700 |
|---|---|---|
| committer | Bo Yang <paulyang1211@gmail.com> | 2017-06-24 11:28:13 -0700 |
| commit | e3c807d4e752b477b707f5d021264faf9b127304 (patch) | |
| tree | 505092dff769b14d6a07be62314bc948b9398090 /src/google/protobuf/compiler/cpp/cpp_map_field.cc | |
| parent | 9c0b35cf620c4904a18e25733f50c9c0474fefa6 (diff) | |
| download | protobuf-e3c807d4e752b477b707f5d021264faf9b127304.tar.gz protobuf-e3c807d4e752b477b707f5d021264faf9b127304.tar.bz2 protobuf-e3c807d4e752b477b707f5d021264faf9b127304.zip | |
Fix more implicit type conversions in public headers and generated code.
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_map_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_map_field.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_map_field.cc b/src/google/protobuf/compiler/cpp/cpp_map_field.cc index ee0ed164..d76db169 100644 --- a/src/google/protobuf/compiler/cpp/cpp_map_field.cc +++ b/src/google/protobuf/compiler/cpp/cpp_map_field.cc @@ -409,13 +409,14 @@ void MapFieldGenerator::GenerateSerializeWithCachedSizes( " for (::google::protobuf::Map< $key_cpp$, $val_cpp$ >::const_iterator\n" " it = this->$name$().begin();\n" " it != this->$name$().end(); ++it, ++n) {\n" - " items[n] = SortItem(&*it);\n" + " items[static_cast<ptrdiff_t>(n)] = SortItem(&*it);\n" " }\n" - " ::std::sort(&items[0], &items[n], Less());\n"); + " ::std::sort(&items[0], &items[static_cast<ptrdiff_t>(n)], Less());\n"); printer->Indent(); GenerateSerializationLoop(printer, variables, SupportsArenas(descriptor_), - utf8_check, "for (size_type i = 0; i < n; i++)", - string_key ? "items[i]" : "items[i].second", false); + utf8_check, "for (size_type i = 0; i < n; i++)", + string_key ? "items[static_cast<ptrdiff_t>(i)]" : + "items[static_cast<ptrdiff_t>(i)].second", false); printer->Outdent(); printer->Print( "} else {\n"); |