diff options
| author | Alex Deymo <deymo@google.com> | 2015-08-26 23:58:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-26 23:58:07 +0000 |
| commit | 787fc4d52fdbbd3c89bb90369a6bef4bb6b611e8 (patch) | |
| tree | 0fe3397fa76d2233b1046d6dd15ef1423899ac95 | |
| parent | 2bd25081c18d440dd70f1ff0ed726f89295e3fdb (diff) | |
| parent | a0d463f6b8c341943da438944b591ee16348815f (diff) | |
| download | protobuf-787fc4d52fdbbd3c89bb90369a6bef4bb6b611e8.tar.gz | |
Merge "Silence -Wsign-compare warning on protobuf-lite headers."
| -rw-r--r-- | src/google/protobuf/wire_format_lite_inl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/wire_format_lite_inl.h b/src/google/protobuf/wire_format_lite_inl.h index 4e8ac9b62..feb225404 100644 --- a/src/google/protobuf/wire_format_lite_inl.h +++ b/src/google/protobuf/wire_format_lite_inl.h @@ -380,7 +380,7 @@ inline bool WireFormatLite::ReadPackedFixedSizePrimitive( #else values->Reserve(old_entries + new_entries); CType value; - for (int i = 0; i < new_entries; ++i) { + for (uint32 i = 0; i < new_entries; ++i) { if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false; values->AddAlreadyReserved(value); } |