[svn] commit: r1784 - in /branches/bind10-20100421-release: ./ src/lib/cc/ src/lib/dns/ src/lib/dns/python_dns.cc src/lib/dns/rdata/generic/rrsig_46.cc src/lib/dns/tests/ src/lib/xfr/Makefile.am

[BIND 10 source code commits]

Author: jreed
Date: Wed Apr 21 15:48:49 2010
New Revision: 1784

Log:
Merge from trunk: r1782: fixed compilation issue by reordering
include statements and adding a warning suppression

Modified:
    branches/bind10-20100421-release/   (props changed)
    branches/bind10-20100421-release/src/lib/cc/   (props changed)
    branches/bind10-20100421-release/src/lib/dns/   (props changed)
    branches/bind10-20100421-release/src/lib/dns/python_dns.cc
    branches/bind10-20100421-release/src/lib/dns/rdata/generic/rrsig_46.cc   (props changed)
    branches/bind10-20100421-release/src/lib/dns/tests/   (props changed)
    branches/bind10-20100421-release/src/lib/xfr/Makefile.am

Modified: branches/bind10-20100421-release/src/lib/dns/python_dns.cc
==============================================================================
--- branches/bind10-20100421-release/src/lib/dns/python_dns.cc (original)
+++ branches/bind10-20100421-release/src/lib/dns/python_dns.cc Wed Apr 21 15:48:49 2010
@@ -14,8 +14,6 @@
 
 // $Id: message_python.cc 2010-03-08 18:44:00 feng $
 
-#include <cassert>
-
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
 #include <boost/python/module.hpp>
@@ -24,6 +22,8 @@
 #include <boost/python/return_internal_reference.hpp>
 #include <boost/python/copy_const_reference.hpp>
 #include <boost/shared_ptr.hpp>
+
+#include <cassert>
 
 #include <exceptions/exceptions.h>
 

Modified: branches/bind10-20100421-release/src/lib/xfr/Makefile.am
==============================================================================
--- branches/bind10-20100421-release/src/lib/xfr/Makefile.am (original)
+++ branches/bind10-20100421-release/src/lib/xfr/Makefile.am Wed Apr 21 15:48:49 2010
@@ -2,7 +2,8 @@
 
 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)/ext
+AM_CPPFLAGS += -I$(top_srcdir)/ext -Wno-strict-aliasing
+
 if GCC_WERROR_OK
 AM_CPPFLAGS += -Werror
 endif