From: JINMEI Tatuya Date: Fri, 15 Nov 2013 08:40:47 +0000 (-0800) Subject: [3213] Revert "[mavericks] suppress a spurious clang warning in libdns++" X-Git-Tag: bind10-1.2.0beta1-release~102^2~15^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89e903003964299fe321bad57e707b925aaf3a91;p=thirdparty%2Fkea.git [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 37cf6f5d5b..542c7a9451 100644 --- 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 59f7b700c9..bda4e85333 100644 --- 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