Fix sign-comparison warnings in public header files.

pull/1829/head
Feng Xiao 8 years ago
parent 16adea3ddc
commit 9009662b71
  1. 2
      src/google/protobuf/map.h
  2. 10
      src/google/protobuf/wire_format_lite_inl.h

@ -1250,7 +1250,7 @@ class Map {
// Return whether table_[b] is a linked list that seems awfully long. // Return whether table_[b] is a linked list that seems awfully long.
// Requires table_[b] to point to a non-empty linked list. // Requires table_[b] to point to a non-empty linked list.
bool TableEntryIsTooLong(size_type b) { bool TableEntryIsTooLong(size_type b) {
const int kMaxLength = 8; const size_type kMaxLength = 8;
size_type count = 0; size_type count = 0;
Node* node = static_cast<Node*>(table_[b]); Node* node = static_cast<Node*>(table_[b]);
do { do {

@ -346,9 +346,9 @@ inline bool WireFormatLite::ReadPackedFixedSizePrimitive(
io::CodedInputStream* input, RepeatedField<CType>* values) { io::CodedInputStream* input, RepeatedField<CType>* values) {
int length; int length;
if (!input->ReadVarintSizeAsInt(&length)) return false; if (!input->ReadVarintSizeAsInt(&length)) return false;
const uint32 old_entries = values->size(); const int old_entries = values->size();
const uint32 new_entries = length / sizeof(CType); const int new_entries = length / sizeof(CType);
const uint32 new_bytes = new_entries * sizeof(CType); const int new_bytes = new_entries * sizeof(CType);
if (new_bytes != length) return false; if (new_bytes != length) return false;
// We would *like* to pre-allocate the buffer to write into (for // We would *like* to pre-allocate the buffer to write into (for
// speed), but *must* avoid performing a very large allocation due // speed), but *must* avoid performing a very large allocation due
@ -382,7 +382,7 @@ inline bool WireFormatLite::ReadPackedFixedSizePrimitive(
#else #else
values->Reserve(old_entries + new_entries); values->Reserve(old_entries + new_entries);
CType value; CType value;
for (uint32 i = 0; i < new_entries; ++i) { for (int i = 0; i < new_entries; ++i) {
if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false; if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false;
values->AddAlreadyReserved(value); values->AddAlreadyReserved(value);
} }
@ -392,7 +392,7 @@ inline bool WireFormatLite::ReadPackedFixedSizePrimitive(
// safely allocate. We read as much as we can into *values // safely allocate. We read as much as we can into *values
// without pre-allocating "length" bytes. // without pre-allocating "length" bytes.
CType value; CType value;
for (uint32 i = 0; i < new_entries; ++i) { for (int i = 0; i < new_entries; ++i) {
if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false; if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false;
values->Add(value); values->Add(value);
} }

Loading…
Cancel
Save