From 92c9053dcdf1f1f121045ebe85a5d322ac084cd0 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Fri, 14 Oct 2005 15:05:40 +0000 Subject: [PATCH] merged from trunk [SVN r31320] --- include/boost/python/object/value_holder.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/python/object/value_holder.hpp b/include/boost/python/object/value_holder.hpp index b12c6d82..85bd74dc 100644 --- a/include/boost/python/object/value_holder.hpp +++ b/include/boost/python/object/value_holder.hpp @@ -88,12 +88,12 @@ private: // required holder implementation template void* value_holder::holds(type_info dst_t, bool null_ptr_only) { - if (void* wrapped = holds_wrapped(dst_t, addressof(m_held), addressof(m_held))) + if (void* wrapped = holds_wrapped(dst_t, boost::addressof(m_held), boost::addressof(m_held))) return wrapped; type_info src_t = python::type_id(); - return src_t == dst_t ? addressof(m_held) - : find_static_type(addressof(m_held), src_t, dst_t); + return src_t == dst_t ? boost::addressof(m_held) + : find_static_type(boost::addressof(m_held), src_t, dst_t); } template @@ -134,7 +134,7 @@ void* value_holder_back_reference::holds( BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_UNFORWARD_LOCAL, nil) ) { - python::detail::initialize_wrapper(self, addressof(this->m_held)); + python::detail::initialize_wrapper(self, boost::addressof(this->m_held)); } # undef N