aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/stubs/fastmem.h
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2017-06-23 12:56:44 -0700
committerBo Yang <paulyang1211@gmail.com>2017-06-24 11:28:13 -0700
commite3c807d4e752b477b707f5d021264faf9b127304 (patch)
tree505092dff769b14d6a07be62314bc948b9398090 /src/google/protobuf/stubs/fastmem.h
parent9c0b35cf620c4904a18e25733f50c9c0474fefa6 (diff)
downloadprotobuf-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/stubs/fastmem.h')
-rw-r--r--src/google/protobuf/stubs/fastmem.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/fastmem.h b/src/google/protobuf/stubs/fastmem.h
index 763a6e60..1f1f6ed3 100644
--- a/src/google/protobuf/stubs/fastmem.h
+++ b/src/google/protobuf/stubs/fastmem.h
@@ -111,7 +111,8 @@ inline int fastmemcmp_inlined(const char *a, const char *b, size_t n) {
b += sizeof(uint32);
}
while (a < a_limit) {
- int d = static_cast<uint32>(*a++) - static_cast<uint32>(*b++);
+ int d =
+ static_cast<int>(static_cast<uint32>(*a++) - static_cast<uint32>(*b++));
if (d) return d;
}
return 0;