diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-05 16:42:13 -0500 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-05 16:42:13 -0500 |
| commit | a270576f535b8ad4bf949be325aab1f0c488078e (patch) | |
| tree | 5e07dfaf49506ff030d6198d02a75a491f4eeee6 | |
| parent | 3e0ec8de2b98312e11444440fbec0aeba2a3465f (diff) | |
| parent | 717f80749996ba97d050dd980a8e2ed97873d49e (diff) | |
| download | protobuf-a270576f535b8ad4bf949be325aab1f0c488078e.tar.gz protobuf-a270576f535b8ad4bf949be325aab1f0c488078e.tar.bz2 protobuf-a270576f535b8ad4bf949be325aab1f0c488078e.zip | |
Merge pull request #71 from abyss7/master
Silence -Wsign-compare warning on Mac
| -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 4e8ac9b6..feb22540 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); } |