From c5b51bb8881dd5c7950143033d507f27b1fc4422 Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Thu, 22 Dec 2011 10:03:46 -0800 Subject: [PATCH] [master] applied workaround for build error with macos+clang+static link. --- .../util/io/socketsessionforwarder_python.cc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/lib/python/isc/util/io/socketsessionforwarder_python.cc b/src/lib/python/isc/util/io/socketsessionforwarder_python.cc index ab88e065c0..bdc2bf7977 100644 --- a/src/lib/python/isc/util/io/socketsessionforwarder_python.cc +++ b/src/lib/python/isc/util/io/socketsessionforwarder_python.cc @@ -52,6 +52,17 @@ s_SocketSessionForwarder::s_SocketSessionForwarder() : cppobj(NULL) { // Import pydoc text #include "socketsessionforwarder_inc.cc" +// See python/isc/log/log.cc for the use of namespace +namespace clang_unnamed_namespace_workaround { +// Internal exception class thrown when address parsing fails +class AddressParseError: public isc::Exception { +public: + AddressParseError(const char *file, size_t line, const char *what): + isc::Exception(file, line, what) {} +}; +} +using namespace clang_unnamed_namespace_workaround; + namespace { int @@ -87,13 +98,6 @@ SocketSessionForwarder_destroy(PyObject* po_self) { Py_TYPE(self)->tp_free(self); } -// Internal exception class thrown when address parsing fails -class AddressParseError: public isc::Exception { -public: - AddressParseError(const char *file, size_t line, const char *what): - isc::Exception(file, line, what) {} -}; - // Convert a Python socket address object to an addrinfo structure by // getaddrinfo. void