mirror of
https://github.com/boostorg/python.git
synced 2026-01-26 06:42:27 +00:00
avoiding naming conflict, object:: -> objects::
[SVN r12230]
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user