[3213] Revert "[mavericks] suppress a spurious clang warning in libdns++"

This reverts commit f2f02dba84b5c12314f6018294423ebc45c4127e.
other commit reportedly addressed the issue that this hack tries to solve.

diff --git a/configure.ac b/configure.ac
index 37cf6f5d5b813a136080ec0d1d76d6979c56b3f0..542c7a9451e2415d8d7853480fa0e2ffb5dfd49d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -138,12 +138,6 @@ BIND10_CXX_TRY_FLAG([-Wno-missing-field-initializers],
        [WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG="-Wno-missing-field-initializers"])
 AC_SUBST(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
 
-# clang's -Wtautological-constant-out-of-range-compare triggers spurious
-# warnings in some of the code, so we have to selectively disable it.
-BIND10_CXX_TRY_FLAG([-Wno-tautological-constant-out-of-range-compare],
-       [WARNING_NO_TAUTOLOGICAL_CONSTANT_OOR_COMP_CFLAG="-Wno-tautological-constant-out-of-range-compare"])
-AC_SUBST(WARNING_NO_TAUTOLOGICAL_CONSTANT_OOR_COMP_CFLAG)
-
 # gcc specific settings:
 if test "X$GXX" = "Xyes"; then
 CXX_VERSION=`$CXX --version 2> /dev/null | head -1`

diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index 59f7b700c97d39407731b31a7215496bfd1857eb..bda4e85333274b454cc1bc2a0c7de923f7e5f4b7 100644 (file)
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -4,13 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/util -I$(top_builddir)/src/lib/util
 AM_CPPFLAGS += $(BOOST_INCLUDES)
-#AM_CXXFLAGS = $(B10_CXXFLAGS)
-AM_CXXFLAGS = $(B10_CXXFLAGS) -Wno-tautological-constant-out-of-range-compare
-
-# This flag triggers a spurious warning in message.cc.  Disabling the flag
-# library-wide may be a bit too strong, but hopefully actual defects that
-# this flag would correctly detect would be very rare.
-AM_CXXFLAGS += $(WARNING_NO_TAUTOLOGICAL_CONSTANT_OOR_COMP_CFLAG)
+AM_CXXFLAGS = $(B10_CXXFLAGS)
 
 CLEANFILES = *.gcno *.gcda
 CLEANFILES += rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc s-rdatacode