From 65c74e39761c0237581d0459d1db6775ec055478 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sun, 6 Jan 2002 14:40:53 +0000 Subject: [PATCH] avoiding naming conflict, object:: -> objects:: [SVN r12235] --- src/object/class.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/object/class.cpp b/src/object/class.cpp index bdd66a77..1b855120 100644 --- a/src/object/class.cpp +++ b/src/object/class.cpp @@ -3,15 +3,13 @@ // copyright notice appears in all copies. This software is provided // "as is" without express or implied warranty, and with no claim as // to its suitability for any purpose. - #include -#include #include #include #include #include -namespace boost { namespace python { namespace object { +namespace boost { namespace python { namespace objects { holder_base::holder_base(converter::type_id_t id) : m_type(id) @@ -160,4 +158,4 @@ find_holder_impl(PyObject* inst, converter::type_id_t type) ? match.base() : 0; } -}}} // namespace boost::python::object +}}} // namespace boost::python::objects