BIND 10 trac739, updated. 4cea30b55073337c32d03bbd9dc813eb92795c2e [trac739] Remove unneeded namespace around resolver logging declarations

[BIND 10 source code commits]

The branch, trac739 has been updated
       via  4cea30b55073337c32d03bbd9dc813eb92795c2e (commit)
       via  f0c1ac2d7613802bbbc9545684ba0a9346bfdc0f (commit)
       via  d1b5154a7c17058ff49aa67f389f52496228e4b6 (commit)
       via  7c576f2e3d986b0f58883776822323ff57535a3c (commit)
      from  5d422dbf6640bae02dc13ad7c9406fe13f42a1ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4cea30b55073337c32d03bbd9dc813eb92795c2e
Author: Stephen Morris <stephen at isc.org>
Date:   Mon May 16 14:15:27 2011 +0100

    [trac739] Remove unneeded namespace around resolver logging declarations

commit f0c1ac2d7613802bbbc9545684ba0a9346bfdc0f
Merge: 5d422dbf6640bae02dc13ad7c9406fe13f42a1ef d1b5154a7c17058ff49aa67f389f52496228e4b6
Author: Stephen Morris <stephen at isc.org>
Date:   Mon May 16 14:01:43 2011 +0100

    Merge branch 'master' into trac739

-----------------------------------------------------------------------

Summary of changes:
 src/bin/resolver/resolver_log.cc   |    7 -------
 src/bin/resolver/resolver_log.h    |    8 +-------
 src/lib/dns/python/Makefile.am     |    1 +
 src/lib/dns/python/rcode_python.cc |    2 ++
 4 files changed, 4 insertions(+), 14 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/resolver/resolver_log.cc b/src/bin/resolver/resolver_log.cc
index 1325550..4af0159 100644
--- a/src/bin/resolver/resolver_log.cc
+++ b/src/bin/resolver/resolver_log.cc
@@ -16,11 +16,4 @@
 
 #include "resolver_log.h"
 
-namespace isc {
-namespace resolver {
-
 isc::log::Logger resolver_logger("resolver");
-
-} // namespace resolver
-} // namespace isc
-
diff --git a/src/bin/resolver/resolver_log.h b/src/bin/resolver/resolver_log.h
index d9649be..63f6abb 100644
--- a/src/bin/resolver/resolver_log.h
+++ b/src/bin/resolver/resolver_log.h
@@ -18,9 +18,6 @@
 #include <log/macros.h>
 #include "resolverdef.h"
 
-namespace isc {
-namespace resolver {
-
 /// \brief Resolver Logging
 ///
 /// Defines the levels used to output debug messages in the resolver.  Note that
@@ -31,7 +28,7 @@ const int RESOLVER_DBG_INIT = 10;
 
 // Configuration messages
 const int RESOLVER_DBG_CONFIG = 30;
-I'm nore really sure how you could get round that.
+
 // Trace sending and receiving of messages
 const int RESOLVER_DBG_IO = 50;
 
@@ -49,7 +46,4 @@ const int RESOLVER_DBG_DETAIL = 90;
 /// space.
 extern isc::log::Logger resolver_logger;
 
-} // namespace resolver
-} // namespace isc
-
 #endif // __RESOLVER_LOG__H
diff --git a/src/lib/dns/python/Makefile.am b/src/lib/dns/python/Makefile.am
index 15b3b1c..1c9afc7 100644
--- a/src/lib/dns/python/Makefile.am
+++ b/src/lib/dns/python/Makefile.am
@@ -8,6 +8,7 @@ pyexec_LTLIBRARIES = pydnspp.la
 pydnspp_la_SOURCES = pydnspp.cc pydnspp_common.cc
 pydnspp_la_SOURCES += rcode_python.cc rcode_python.h
 pydnspp_la_SOURCES += tsigerror_python.cc tsigerror_python.h
+pydnspp_la_SOURCES += tsigerror_python_inc.cc
 pydnspp_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
 pydnspp_la_LDFLAGS = $(PYTHON_LDFLAGS)
 
diff --git a/src/lib/dns/python/rcode_python.cc b/src/lib/dns/python/rcode_python.cc
index efb0f43..b594ad3 100644
--- a/src/lib/dns/python/rcode_python.cc
+++ b/src/lib/dns/python/rcode_python.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <Python.h>
+
 #include <exceptions/exceptions.h>
 
 #include <dns/rcode.h>