aboutsummaryrefslogtreecommitdiff
path: root/python/paludis_python.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-26 13:59:04 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-26 13:59:04 +0000
commit118de550d2dc5508ff4446bdf7f2ddf7b497b9ba (patch)
tree5ced2de062474cb8e6537e68d71cbc7c5a80e802 /python/paludis_python.hh
parentf76a3a0a7b38b5a3652a9e9bcb13942483f7c53a (diff)
downloadpaludis-118de550d2dc5508ff4446bdf7f2ddf7b497b9ba.tar.gz
paludis-118de550d2dc5508ff4446bdf7f2ddf7b497b9ba.tar.xz
paludis::tr1:: is dead. We no longer support compilers that don't do tr1 (that means you, gcc-3).
Diffstat (limited to 'python/paludis_python.hh')
-rw-r--r--python/paludis_python.hh25
1 files changed, 12 insertions, 13 deletions
diff --git a/python/paludis_python.hh b/python/paludis_python.hh
index 25fa6b8c1..719a398d6 100644
--- a/python/paludis_python.hh
+++ b/python/paludis_python.hh
@@ -21,24 +21,23 @@
#define PALUDIS_GUARD_PYTHON_PALUDIS_PYTHON_HH 1
#include <python/mutex.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/attributes.hh>
-
#include <boost/python.hpp>
+#include <tr1/memory>
namespace paludis
{
- // Make Boost.Python work with tr1::shared_ptr<>
+ // Make Boost.Python work with std::tr1::shared_ptr<>
template <typename T_>
- inline T_ * get_pointer(tr1::shared_ptr<T_> const & p)
+ inline T_ * get_pointer(std::tr1::shared_ptr<T_> const & p)
{
return p.get();
}
- // Make Boost.Python work with tr1::shared_ptr<const>
+ // Make Boost.Python work with std::tr1::shared_ptr<const>
template <typename T_>
- inline T_ * get_pointer(tr1::shared_ptr<const T_> const & p)
+ inline T_ * get_pointer(std::tr1::shared_ptr<const T_> const & p)
{
return const_cast<T_*>(p.get());
}
@@ -48,16 +47,16 @@ namespace boost
{
namespace python
{
- // Make Boost.Python work with tr1::shared_ptr<>
+ // Make Boost.Python work with std::tr1::shared_ptr<>
template <typename T_>
- struct pointee<paludis::tr1::shared_ptr<T_> >
+ struct pointee<std::tr1::shared_ptr<T_> >
{
typedef T_ type;
};
- // Make Boost.Python work with tr1::shared_ptr<const>
+ // Make Boost.Python work with std::tr1::shared_ptr<const>
template <typename T_>
- struct pointee<paludis::tr1::shared_ptr<const T_> >
+ struct pointee<std::tr1::shared_ptr<const T_> >
{
typedef T_ type;
};
@@ -82,10 +81,10 @@ namespace paludis
register_shared_ptrs_to_python(RegisterSharedPointers rsp=rsp_both)
{
if (rsp == rsp_both || rsp == rsp_non_const)
- boost::python::register_ptr_to_python<tr1::shared_ptr<T_> >();
+ boost::python::register_ptr_to_python<std::tr1::shared_ptr<T_> >();
if (rsp == rsp_both || rsp == rsp_const)
- boost::python::register_ptr_to_python<tr1::shared_ptr<const T_> >();
- boost::python::implicitly_convertible<tr1::shared_ptr<T_>, tr1::shared_ptr<const T_> >();
+ boost::python::register_ptr_to_python<std::tr1::shared_ptr<const T_> >();
+ boost::python::implicitly_convertible<std::tr1::shared_ptr<T_>, std::tr1::shared_ptr<const T_> >();
}
// expose stringifyable enums