commit a01a58c85ae6f0b1fe97e4a383bb7536285264d8
author Chih-Hung Hsieh <chh@google.com> Wed Jan 14 19:10:13 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 14 19:10:13 2015 +0000
tree 38201abed02b3a3ee69d41530a171b90478e18af
parent 7c48c27143b7a8b3ca50ac7db66e4e2f1c3dbb2b
parent 3b0a9c15a89fcdf6afb2ae41e92032d48b63a270

Merge "Do not compare this with NULL."

Android.mk

diff --git a/Android.mk b/Android.mk
index 0cb87cc..40e35d2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -234,7 +234,5 @@
 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)

cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc

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==(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() &&