aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2014-10-06 14:12:21 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2014-10-06 14:12:21 -0700
commitc1d16457dbf5f1b0770db406b75b4b2063556cc3 (patch)
tree5147318dac75672fa8716316614e17372e4dc2b1
parent56aa52d98657a9f093e85d2d2e15c87e5e50c967 (diff)
parentbb7d210c2a99e45f12002cb67f337de933f35e0c (diff)
downloadprotobuf-c1d16457dbf5f1b0770db406b75b4b2063556cc3.tar.gz
protobuf-c1d16457dbf5f1b0770db406b75b4b2063556cc3.tar.bz2
protobuf-c1d16457dbf5f1b0770db406b75b4b2063556cc3.zip
Merge pull request #35 from dsrosario/fix_warning
Fix "warning C4018: '<' : signed/unsigned mismatch"
-rw-r--r--src/google/protobuf/wire_format_lite_inl.h2
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 ac197eee..4e8ac9b6 100644
--- a/src/google/protobuf/wire_format_lite_inl.h
+++ b/src/google/protobuf/wire_format_lite_inl.h
@@ -390,7 +390,7 @@ inline bool WireFormatLite::ReadPackedFixedSizePrimitive(
// safely allocate. We read as much as we can into *values
// without pre-allocating "length" bytes.
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->Add(value);
}