diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -234,7 +234,5 @@ LOCAL_SHARED_LIBRARIES := libicuuc libicui18n LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -# Clang always complain about comparison of this with NULL. -LOCAL_CPPFLAGS += -Wno-tautological-undefined-compare include $(BUILD_STATIC_LIBRARY) diff --git a/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc b/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc index ab9953b..a299b3e 100644 --- a/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc +++ b/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc @@ -52,7 +52,7 @@ bool BitmapGlyphInfo::operator==(const BitmapGlyphInfo& rhs) const { bool BitmapGlyphInfo::operator==(BitmapGlyphInfo* rhs) { if (rhs == NULL) { - return this == NULL; + return false; // Well defined C++ code's this is always not null. } return (format_ == rhs->format() && glyph_id_ == rhs->glyph_id() && |