summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2013-11-13 11:07:49 -0800
committerKristian Monsen <kristianm@google.com>2013-11-13 12:06:41 -0800
commitcd0ff6eb0b178cc1c3ed4300cd4066ea3a5c180b (patch)
treef901f78f20c6bfb5d00d6c2b4a8e2f596f43c9bf
parentac8e2e150716784a707587ae6e2c8b3a291a2ae7 (diff)
downloadexternal_protobuf-cd0ff6eb0b178cc1c3ed4300cd4066ea3a5c180b.zip
external_protobuf-cd0ff6eb0b178cc1c3ed4300cd4066ea3a5c180b.tar.gz
external_protobuf-cd0ff6eb0b178cc1c3ed4300cd4066ea3a5c180b.tar.bz2
Fix warnings warnings in header files, hide others.
Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
-rw-r--r--Android.mk10
-rw-r--r--src/google/protobuf/io/coded_stream.h4
-rw-r--r--src/google/protobuf/wire_format_lite_inl.h2
3 files changed, 10 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 56419db..c977d3c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,8 @@
LOCAL_PATH := $(call my-dir)
+IGNORED_WARNINGS := -Wno-sign-compare -Wno-unused-parameter -Wno-sign-promo
+
CC_LITE_SRC_FILES := \
src/google/protobuf/stubs/common.cc \
src/google/protobuf/stubs/once.cc \
@@ -227,7 +229,7 @@ LOCAL_C_INCLUDES := \
#
#LOCAL_COPY_HEADERS_TO := $(LOCAL_MODULE)
-LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
+LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI $(IGNORED_WARNINGS)
# These are the minimum versions and don't need to be update.
ifeq ($(TARGET_ARCH),arm)
@@ -293,7 +295,7 @@ LOCAL_C_INCLUDES := \
#
#LOCAL_COPY_HEADERS_TO := $(LOCAL_MODULE)
-LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
+LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI $(IGNORED_WARNINGS)
# These are the minimum versions and don't need to be update.
ifeq ($(TARGET_ARCH),arm)
@@ -319,7 +321,7 @@ LOCAL_C_INCLUDES := \
external/zlib \
$(LOCAL_PATH)/src
-LOCAL_CFLAGS := -frtti
+LOCAL_CFLAGS := -frtti $(IGNORED_WARNINGS)
LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := gnustl_static
@@ -349,6 +351,8 @@ LOCAL_C_INCLUDES := \
LOCAL_STATIC_LIBRARIES += libz
LOCAL_LDLIBS := -lpthread
+LOCAL_CFLAGS := $(IGNORED_WARNINGS)
+
include $(BUILD_HOST_EXECUTABLE)
# To test java proto params build rules.
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 <typename CType, enum WireFormatLite::FieldType DeclaredType>
-inline bool WireFormatLite::ReadRepeatedPrimitive(int tag_size,
+inline bool WireFormatLite::ReadRepeatedPrimitive(int, // tag_size, unused
uint32 tag,
io::CodedInputStream* input,
RepeatedField<CType>* values) {