From 26d520af3cd25249987f0864cac66f1fc1683818 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Sun, 6 Jan 2002 14:35:27 +0000
Subject: [PATCH] avoiding naming conflict, object:: -> objects::

[SVN r12230]
---
 include/boost/python/converter/class.hpp        | 10 +++++-----
 include/boost/python/object/class.hpp           |  4 ++--
 include/boost/python/object/class_unwrapper.hpp |  4 ++--
 include/boost/python/object/construct.hpp       |  4 ++--
 include/boost/python/object/make_holder.hpp     |  4 ++--
 include/boost/python/object/value_holder.hpp    |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/boost/python/converter/class.hpp b/include/boost/python/converter/class.hpp
index 6e09a961..c6fef86a 100644
--- a/include/boost/python/converter/class.hpp
+++ b/include/boost/python/converter/class.hpp
@@ -32,31 +32,31 @@ struct class_unwrapper
 template <class T>
 void* class_unwrapper<T>::can_convert(PyObject* p) const
 {
-    return object::find_holder<T>(p);
+    return objects::find_holder<T>(p);
 }
 
 template <class T>
 T& class_unwrapper<T>::convert(PyObject*, void* holder_, boost::type<T&>) const
 {
-    return *static_cast<object::holder<T>*>(holder_)->target();
+    return *static_cast<objects::holder<T>*>(holder_)->target();
 }
 
 template <class T>
 T const& class_unwrapper<T>::convert(PyObject*, void* holder_, boost::type<T const&>) const
 {
-    return *static_cast<object::holder<T>*>(holder_)->target();
+    return *static_cast<objects::holder<T>*>(holder_)->target();
 }
 
 template <class T>
 T* class_unwrapper<T>::convert(PyObject*, void* holder_, boost::type<T*>) const
 {
-    return static_cast<object::holder<T>*>(holder_)->target();
+    return static_cast<objects::holder<T>*>(holder_)->target();
 }
 
 template <class T>
 T const* class_unwrapper<T>::convert(PyObject*, void* holder_, boost::type<T const*>) const
 {
-    return static_cast<object::holder<T>*>(holder_)->target();
+    return static_cast<objects::holder<T>*>(holder_)->target();
 }
 
 }}} // namespace boost::python::converter
diff --git a/include/boost/python/object/class.hpp b/include/boost/python/object/class.hpp
index 35085e5f..b272d5fe 100644
--- a/include/boost/python/object/class.hpp
+++ b/include/boost/python/object/class.hpp
@@ -12,7 +12,7 @@
 # include <boost/python/converter/type_id.hpp>
 # include <boost/iterator_adaptors.hpp>
 
-namespace boost { namespace python { namespace object { 
+namespace boost { namespace python { namespace objects { 
 
 template <class T> struct holder;
 
@@ -98,6 +98,6 @@ holder<Held>::holder()
 {
 }
 
-}}} // namespace boost::python::object
+}}} // namespace boost::python::objects
 
 #endif // CLASS_DWA20011214_HPP
diff --git a/include/boost/python/object/class_unwrapper.hpp b/include/boost/python/object/class_unwrapper.hpp
index 4fa441e1..666c6e93 100644
--- a/include/boost/python/object/class_unwrapper.hpp
+++ b/include/boost/python/object/class_unwrapper.hpp
@@ -9,7 +9,7 @@
 # include <boost/python/object/class.hpp>
 # include <boost/python/converter/unwrapper.hpp>
 
-namespace boost { namespace python { namespace object { 
+namespace boost { namespace python { namespace objects { 
 
 template <class T>
 struct class_unwrapper
@@ -35,6 +35,6 @@ struct class_unwrapper
 # endif 
 };
 
-}}} // namespace boost::python::object
+}}} // namespace boost::python::objects
 
 #endif // CLASS_UNWRAPPER_DWA20011221_HPP
diff --git a/include/boost/python/object/construct.hpp b/include/boost/python/object/construct.hpp
index 3ff701d2..1eb73e4a 100644
--- a/include/boost/python/object/construct.hpp
+++ b/include/boost/python/object/construct.hpp
@@ -6,7 +6,7 @@
 #ifndef CONSTRUCT_DWA20011215_HPP
 # define CONSTRUCT_DWA20011215_HPP
 
-namespace boost { namespace python { namespace object { 
+namespace boost { namespace python { namespace objects { 
 
 template <class T, class ArgList>
 struct construct
@@ -19,6 +19,6 @@ struct construct
     }
 };
 
-}}} // namespace boost::python::object
+}}} // namespace boost::python::objects
 
 #endif // CONSTRUCT_DWA20011215_HPP
diff --git a/include/boost/python/object/make_holder.hpp b/include/boost/python/object/make_holder.hpp
index fb5ec382..76b3a5f4 100644
--- a/include/boost/python/object/make_holder.hpp
+++ b/include/boost/python/object/make_holder.hpp
@@ -11,7 +11,7 @@
 # include <boost/python/object/class.hpp>
 # include <boost/python/detail/wrap_python.hpp>
 
-namespace boost { namespace python { namespace object { 
+namespace boost { namespace python { namespace objects { 
 
 
 template <class T> struct undefined;
@@ -119,6 +119,6 @@ struct make_holder<3>
     };
 };
 
-}}} // namespace boost::python::object
+}}} // namespace boost::python::objects
 
 #endif // MAKE_HOLDER_DWA20011215_HPP
diff --git a/include/boost/python/object/value_holder.hpp b/include/boost/python/object/value_holder.hpp
index 128d170b..a06afe84 100644
--- a/include/boost/python/object/value_holder.hpp
+++ b/include/boost/python/object/value_holder.hpp
@@ -8,7 +8,7 @@
 
 # include <boost/python/object/class.hpp>
 
-namespace boost { namespace python { namespace object { 
+namespace boost { namespace python { namespace objects { 
 
 template <class Held>
 struct value_holder : holder<Held>
@@ -75,6 +75,6 @@ struct value_holder_generator
     };
 };
 
-}}} // namespace boost::python::object
+}}} // namespace boost::python::objects
 
 #endif // VALUE_HOLDER_DWA20011215_HPP