From cd0ff6eb0b178cc1c3ed4300cd4066ea3a5c180b Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 13 Nov 2013 11:07:49 -0800 Subject: Fix warnings warnings in header files, hide others. Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e --- src/google/protobuf/io/coded_stream.h | 4 ++-- src/google/protobuf/wire_format_lite_inl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/google/protobuf/io/coded_stream.h b/src/google/protobuf/io/coded_stream.h index dcbb0d4..e5f6161 100644 --- a/src/google/protobuf/io/coded_stream.h +++ b/src/google/protobuf/io/coded_stream.h @@ -521,7 +521,7 @@ class LIBPROTOBUF_EXPORT CodedInputStream { bool ReadStringFallback(string* buffer, int size); // Return the size of the buffer. - int BufferSize() const; + uint32 BufferSize() const; static const int kDefaultTotalBytesLimit = 64 << 20; // 64MB @@ -1031,7 +1031,7 @@ inline MessageFactory* CodedInputStream::GetExtensionFactory() { return extension_factory_; } -inline int CodedInputStream::BufferSize() const { +inline uint32 CodedInputStream::BufferSize() const { return buffer_end_ - buffer_; } diff --git a/src/google/protobuf/wire_format_lite_inl.h b/src/google/protobuf/wire_format_lite_inl.h index d7b2c30..3f0d7f8 100644 --- a/src/google/protobuf/wire_format_lite_inl.h +++ b/src/google/protobuf/wire_format_lite_inl.h @@ -222,7 +222,7 @@ inline const uint8* WireFormatLite::ReadPrimitiveFromArray< } template -inline bool WireFormatLite::ReadRepeatedPrimitive(int tag_size, +inline bool WireFormatLite::ReadRepeatedPrimitive(int, // tag_size, unused uint32 tag, io::CodedInputStream* input, RepeatedField* values) { -- cgit v1.1