aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/action.cc8
-rw-r--r--python/additional_tests.cc18
-rw-r--r--python/contents.cc16
-rw-r--r--python/dep_label.cc20
-rw-r--r--python/dep_list.cc10
-rw-r--r--python/dep_spec.cc138
-rw-r--r--python/dep_spec.hh48
-rw-r--r--python/dep_tag.cc6
-rw-r--r--python/environment.cc62
-rw-r--r--python/exception.cc6
-rw-r--r--python/exception.hh16
-rw-r--r--python/iterable.hh34
-rw-r--r--python/mask.cc62
-rw-r--r--python/metadata_key.cc212
-rw-r--r--python/package_database.cc2
-rw-r--r--python/paludis_python.hh25
-rw-r--r--python/query.cc82
-rw-r--r--python/repository.cc8
18 files changed, 384 insertions, 389 deletions
diff --git a/python/action.cc b/python/action.cc
index 700df210b..a80ec18e4 100644
--- a/python/action.cc
+++ b/python/action.cc
@@ -21,10 +21,10 @@
#include <python/exception.hh>
#include <paludis/action.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/util/kc.hh>
#include <paludis/repository.hh>
+#include <tr1/memory>
using namespace paludis;
using namespace paludis::python;
@@ -92,7 +92,7 @@ void expose_action()
"InstallActionOptions",
"Options for InstallAction.",
bp::init<const bool &, const InstallActionDebugOption &, const InstallActionChecksOption &,
- const tr1::shared_ptr<paludis::Repository> &>(
+ const std::tr1::shared_ptr<paludis::Repository> &>(
"__init__(no_config_protect_bool, InstallActionDebugOption,\n"
"InstallActionChecksOption, Repository)"
)
@@ -116,8 +116,8 @@ void expose_action()
)
.add_property("destination",
- &kc_getter<InstallActionOptions, tr1::shared_ptr<Repository>, k::destination>,
- &kc_setter<InstallActionOptions, tr1::shared_ptr<Repository>, k::destination>,
+ &kc_getter<InstallActionOptions, std::tr1::shared_ptr<Repository>, k::destination>,
+ &kc_setter<InstallActionOptions, std::tr1::shared_ptr<Repository>, k::destination>,
"[rw] Repository"
)
;
diff --git a/python/additional_tests.cc b/python/additional_tests.cc
index bc7d3bf6c..58ff00593 100644
--- a/python/additional_tests.cc
+++ b/python/additional_tests.cc
@@ -21,7 +21,6 @@
#include <python/paludis_python.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -38,6 +37,7 @@
#include <paludis/stringify_formatter-impl.hh>
#include <paludis/util/clone-impl.hh>
#include <paludis/util/visitor-impl.hh>
+#include <tr1/memory>
using namespace paludis;
namespace bp = boost::python;
@@ -46,8 +46,8 @@ namespace environment
{
void test_env(Environment & e)
{
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&e, RepositoryName("fakerepo")));
- tr1::shared_ptr<PackageID> pid(repo->add_version("cat", "pkg", "1.0"));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&e, RepositoryName("fakerepo")));
+ std::tr1::shared_ptr<PackageID> pid(repo->add_version("cat", "pkg", "1.0"));
e.package_database()->add_repository(0, repo);
UseFlagName u("use");
@@ -57,7 +57,7 @@ namespace environment
bool PALUDIS_ATTRIBUTE((unused)) b2(e.accept_license("l", *pid));
- tr1::shared_ptr<KeywordNameSet> kns(new KeywordNameSet);
+ std::tr1::shared_ptr<KeywordNameSet> kns(new KeywordNameSet);
kns->insert(KeywordName("keyword"));
bool PALUDIS_ATTRIBUTE((unused)) b3(e.accept_keywords(kns, *pid));
@@ -148,7 +148,7 @@ namespace metadata_key
MetadataKeyType foo(m.type());
}
- void test_metadata_package_id_key(const MetadataValueKey<tr1::shared_ptr<const PackageID> > & m)
+ void test_metadata_package_id_key(const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > & m)
{
test_metadata_key(m);
m.value();
@@ -173,13 +173,13 @@ namespace metadata_key
time_t PALUDIS_ATTRIBUTE((unused)) t(m.value());
}
- void test_metadata_contents_key(const MetadataValueKey<tr1::shared_ptr<const Contents> > & m)
+ void test_metadata_contents_key(const MetadataValueKey<std::tr1::shared_ptr<const Contents> > & m)
{
test_metadata_key(m);
m.value();
}
- void test_metadata_repository_mask_info_key(const MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > & m)
+ void test_metadata_repository_mask_info_key(const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > & m)
{
test_metadata_key(m);
m.value();
@@ -203,8 +203,8 @@ namespace metadata_key
m.pretty_print_flat(ff);
TestEnvironment e;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&e, RepositoryName("fakerepo")));
- tr1::shared_ptr<PackageID> pid(repo->add_version("cat", "pkg", "1.0"));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&e, RepositoryName("fakerepo")));
+ std::tr1::shared_ptr<PackageID> pid(repo->add_version("cat", "pkg", "1.0"));
m.pretty_print_flat_with_comparison(&e, pid, ff);
}
diff --git a/python/contents.cc b/python/contents.cc
index 89da71e3a..f1a66f2e3 100644
--- a/python/contents.cc
+++ b/python/contents.cc
@@ -28,16 +28,16 @@ namespace bp = boost::python;
// For classes derived from ContentsEntry
template <typename C_>
class class_contents:
- public bp::class_<C_, tr1::shared_ptr<C_>, bp::bases<ContentsEntry>, boost::noncopyable>
+ public bp::class_<C_, std::tr1::shared_ptr<C_>, bp::bases<ContentsEntry>, boost::noncopyable>
{
public:
template <class Init_>
class_contents(const std::string & name, const std::string & class_doc, Init_ initspec) :
- bp::class_<C_, tr1::shared_ptr<C_>, bp::bases<ContentsEntry>, boost::noncopyable>(
+ bp::class_<C_, std::tr1::shared_ptr<C_>, bp::bases<ContentsEntry>, boost::noncopyable>(
name.c_str(), class_doc.c_str(), initspec)
{
- bp::register_ptr_to_python<tr1::shared_ptr<const C_> >();
- bp::implicitly_convertible<tr1::shared_ptr<C_>, tr1::shared_ptr<ContentsEntry> >();
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const C_> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<C_>, std::tr1::shared_ptr<ContentsEntry> >();
}
};
@@ -46,9 +46,9 @@ void expose_contents()
/**
* ContentsEntry
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const ContentsEntry> >();
- bp::implicitly_convertible<tr1::shared_ptr<ContentsEntry>,
- tr1::shared_ptr<const ContentsEntry> >();
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const ContentsEntry> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<ContentsEntry>,
+ std::tr1::shared_ptr<const ContentsEntry> >();
bp::class_<ContentsEntry, boost::noncopyable>
(
"ContentsEntry",
@@ -134,7 +134,7 @@ void expose_contents()
* Contents
*/
register_shared_ptrs_to_python<Contents>(rsp_const);
- bp::class_<Contents, tr1::shared_ptr<Contents>, boost::noncopyable>
+ bp::class_<Contents, std::tr1::shared_ptr<Contents>, boost::noncopyable>
(
"Contents",
"Iterable of ContentsEntry.\n"
diff --git a/python/dep_label.cc b/python/dep_label.cc
index e90e29665..2477be1a4 100644
--- a/python/dep_label.cc
+++ b/python/dep_label.cc
@@ -29,33 +29,33 @@ namespace bp = boost::python;
template <typename L_>
struct class_concrete_uri_label :
- bp::class_<L_, tr1::shared_ptr<L_>, bp::bases<URILabel>, boost::noncopyable>
+ bp::class_<L_, std::tr1::shared_ptr<L_>, bp::bases<URILabel>, boost::noncopyable>
{
class_concrete_uri_label(const std::string & name) :
- bp::class_<L_, tr1::shared_ptr<L_>, bp::bases<URILabel>, boost::noncopyable>
+ bp::class_<L_, std::tr1::shared_ptr<L_>, bp::bases<URILabel>, boost::noncopyable>
(
name.c_str(),
"A concrete URI label class.",
bp::init<const std::string &>("__init__(string)")
)
{
- bp::implicitly_convertible<tr1::shared_ptr<L_>, tr1::shared_ptr<URILabel> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<L_>, std::tr1::shared_ptr<URILabel> >();
}
};
template <typename L_, typename C_>
struct class_concrete_dependency_label :
- bp::class_<L_, tr1::shared_ptr<L_>, bp::bases<C_>, boost::noncopyable>
+ bp::class_<L_, std::tr1::shared_ptr<L_>, bp::bases<C_>, boost::noncopyable>
{
class_concrete_dependency_label(const std::string & name, const std::string & doc) :
- bp::class_<L_, tr1::shared_ptr<L_>, bp::bases<C_>, boost::noncopyable>
+ bp::class_<L_, std::tr1::shared_ptr<L_>, bp::bases<C_>, boost::noncopyable>
(
name.c_str(),
doc.c_str(),
bp::init<const std::string &>("__init__(string)")
)
{
- bp::implicitly_convertible<tr1::shared_ptr<L_>, tr1::shared_ptr<C_> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<L_>, std::tr1::shared_ptr<C_> >();
}
};
@@ -110,7 +110,7 @@ void expose_dep_label()
/**
* DependencySystemLabel
*/
- bp::implicitly_convertible<tr1::shared_ptr<DependencySystemLabel>, tr1::shared_ptr<DependencyLabel> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<DependencySystemLabel>, std::tr1::shared_ptr<DependencyLabel> >();
register_shared_ptrs_to_python<DependencySystemLabel>();
bp::class_<DependencySystemLabel, bp::bases<DependencyLabel>, boost::noncopyable>
(
@@ -122,7 +122,7 @@ void expose_dep_label()
/**
* DependencyTypeLabel
*/
- bp::implicitly_convertible<tr1::shared_ptr<DependencyTypeLabel>, tr1::shared_ptr<DependencyLabel> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<DependencyTypeLabel>, std::tr1::shared_ptr<DependencyLabel> >();
register_shared_ptrs_to_python<DependencyTypeLabel>();
bp::class_<DependencyTypeLabel, bp::bases<DependencyLabel>, boost::noncopyable>
(
@@ -134,7 +134,7 @@ void expose_dep_label()
/**
* DependencySuggestLabel
*/
- bp::implicitly_convertible<tr1::shared_ptr<DependencySuggestLabel>, tr1::shared_ptr<DependencyLabel> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<DependencySuggestLabel>, std::tr1::shared_ptr<DependencyLabel> >();
register_shared_ptrs_to_python<DependencySuggestLabel>();
bp::class_<DependencySuggestLabel, bp::bases<DependencyLabel>, boost::noncopyable>
(
@@ -146,7 +146,7 @@ void expose_dep_label()
/**
* DependencyABIsLabel
*/
- bp::implicitly_convertible<tr1::shared_ptr<DependencyABIsLabel>, tr1::shared_ptr<DependencyLabel> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<DependencyABIsLabel>, std::tr1::shared_ptr<DependencyLabel> >();
register_shared_ptrs_to_python<DependencyABIsLabel>();
bp::class_<DependencyABIsLabel, bp::bases<DependencyLabel>, boost::noncopyable>
(
diff --git a/python/dep_list.cc b/python/dep_list.cc
index 631b27576..731962ea0 100644
--- a/python/dep_list.cc
+++ b/python/dep_list.cc
@@ -32,15 +32,15 @@ namespace bp = boost::python;
struct DepListWrapper
{
static void
- add(DepList & self, tr1::shared_ptr<SetSpecTree::ConstItem> st,
- tr1::shared_ptr<const DestinationsSet> & d)
+ add(DepList & self, std::tr1::shared_ptr<SetSpecTree::ConstItem> st,
+ std::tr1::shared_ptr<const DestinationsSet> & d)
{
self.add(*st, d);
}
static bool
- already_installed(const DepList & self, tr1::shared_ptr<DependencySpecTree::ConstItem> st,
- tr1::shared_ptr<const DestinationsSet> & d)
+ already_installed(const DepList & self, std::tr1::shared_ptr<DependencySpecTree::ConstItem> st,
+ std::tr1::shared_ptr<const DestinationsSet> & d)
{
return self.already_installed(*st, d);
}
@@ -235,7 +235,7 @@ void expose_dep_list()
/**
* DepList
*/
- tr1::shared_ptr<DepListOptions> (DepList::* options_ptr)() = &DepList::options;
+ std::tr1::shared_ptr<DepListOptions> (DepList::* options_ptr)() = &DepList::options;
DepList::Iterator (DepList::*dl_begin_ptr)() = &DepList::begin;
DepList::Iterator (DepList::*dl_end_ptr)() = &DepList::end;
bp::class_<DepList, boost::noncopyable>
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index c76d5981f..c0e5054a8 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -32,10 +32,10 @@
#include <paludis/util/visitor-impl.hh>
#include <paludis/util/save.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/tr1_type_traits.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/make_shared_ptr.hh>
+#include <tr1/type_traits>
#include <list>
using namespace paludis;
@@ -72,7 +72,7 @@ template class Visits<const PythonDependencyLabelsDepSpec>;
template class Visits<const PythonNamedSetDepSpec>;
template class WrappedForwardIterator<PythonCompositeDepSpec::ConstIteratorTag,
- const tr1::shared_ptr<const PythonDepSpec> >;
+ const std::tr1::shared_ptr<const PythonDepSpec> >;
PythonDepSpec::PythonDepSpec()
{
@@ -99,33 +99,33 @@ namespace paludis
template<>
struct Implementation<PythonCompositeDepSpec>
{
- std::list<tr1::shared_ptr<const PythonDepSpec> > children;
+ std::list<std::tr1::shared_ptr<const PythonDepSpec> > children;
};
template<>
struct Implementation<PythonPackageDepSpec>
{
- tr1::shared_ptr<const QualifiedPackageName> package_ptr;
- tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr;
- tr1::shared_ptr<const PackageNamePart> package_name_part_ptr;
- tr1::shared_ptr<VersionRequirements> version_requirements;
+ std::tr1::shared_ptr<const QualifiedPackageName> package_ptr;
+ std::tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr;
+ std::tr1::shared_ptr<const PackageNamePart> package_name_part_ptr;
+ std::tr1::shared_ptr<VersionRequirements> version_requirements;
VersionRequirementsMode version_requirements_mode;
- tr1::shared_ptr<const SlotRequirement> slot;
- tr1::shared_ptr<const RepositoryName> repository;
- tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements;
- tr1::shared_ptr<const DepTag> tag;
+ std::tr1::shared_ptr<const SlotRequirement> slot;
+ std::tr1::shared_ptr<const RepositoryName> repository;
+ std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements;
+ std::tr1::shared_ptr<const DepTag> tag;
const std::string str;
Implementation(
- const tr1::shared_ptr<const QualifiedPackageName> & q,
- const tr1::shared_ptr<const CategoryNamePart> & c,
- const tr1::shared_ptr<const PackageNamePart> & p,
- const tr1::shared_ptr<VersionRequirements> & v,
+ const std::tr1::shared_ptr<const QualifiedPackageName> & q,
+ const std::tr1::shared_ptr<const CategoryNamePart> & c,
+ const std::tr1::shared_ptr<const PackageNamePart> & p,
+ const std::tr1::shared_ptr<VersionRequirements> & v,
const VersionRequirementsMode m,
- const tr1::shared_ptr<const SlotRequirement> & s,
- const tr1::shared_ptr<const RepositoryName> & r,
- const tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> & u,
- const tr1::shared_ptr<const DepTag> & t,
+ const std::tr1::shared_ptr<const SlotRequirement> & s,
+ const std::tr1::shared_ptr<const RepositoryName> & r,
+ const std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> & u,
+ const std::tr1::shared_ptr<const DepTag> & t,
const std::string & st) :
package_ptr(q),
category_name_part_ptr(c),
@@ -152,7 +152,7 @@ PythonCompositeDepSpec::~PythonCompositeDepSpec()
}
void
-PythonCompositeDepSpec::add_child(const tr1::shared_ptr<const PythonDepSpec> c)
+PythonCompositeDepSpec::add_child(const std::tr1::shared_ptr<const PythonDepSpec> c)
{
_imp->children.push_back(c);
}
@@ -208,7 +208,7 @@ PythonConditionalDepSpec::condition_meetable() const
return _data->condition_meetable();
}
-const tr1::shared_ptr<const ConditionalDepSpecData>
+const std::tr1::shared_ptr<const ConditionalDepSpecData>
PythonConditionalDepSpec::data() const
{
return _data;
@@ -241,13 +241,13 @@ PythonStringDepSpec::text() const
}
template <typename T_>
-tr1::shared_ptr<T_>
-deep_copy(const tr1::shared_ptr<const T_> & x)
+std::tr1::shared_ptr<T_>
+deep_copy(const std::tr1::shared_ptr<const T_> & x)
{
if (x)
- return tr1::shared_ptr<T_>(new T_(*x));
+ return std::tr1::shared_ptr<T_>(new T_(*x));
else
- return tr1::shared_ptr<T_>();
+ return std::tr1::shared_ptr<T_>();
}
PythonPackageDepSpec::PythonPackageDepSpec(const PackageDepSpec & p) :
@@ -332,7 +332,7 @@ PythonPackageDepSpec::operator PackageDepSpec() const
}
-PythonPackageDepSpec::operator tr1::shared_ptr<PackageDepSpec>() const
+PythonPackageDepSpec::operator std::tr1::shared_ptr<PackageDepSpec>() const
{
return make_shared_ptr(new PackageDepSpec(*this));
}
@@ -343,7 +343,7 @@ PythonPackageDepSpec::as_package_dep_spec() const
return this;
}
-const tr1::shared_ptr<const PythonPackageDepSpec>
+const std::tr1::shared_ptr<const PythonPackageDepSpec>
PythonPackageDepSpec::without_additional_requirements() const
{
PackageDepSpec p(*this);
@@ -351,25 +351,25 @@ PythonPackageDepSpec::without_additional_requirements() const
return make_shared_ptr(new PythonPackageDepSpec(*p.without_additional_requirements()));
}
-tr1::shared_ptr<const QualifiedPackageName>
+std::tr1::shared_ptr<const QualifiedPackageName>
PythonPackageDepSpec::package_ptr() const
{
return _imp->package_ptr;
}
-tr1::shared_ptr<const PackageNamePart>
+std::tr1::shared_ptr<const PackageNamePart>
PythonPackageDepSpec::package_name_part_ptr() const
{
return _imp->package_name_part_ptr;
}
-tr1::shared_ptr<const CategoryNamePart>
+std::tr1::shared_ptr<const CategoryNamePart>
PythonPackageDepSpec::category_name_part_ptr() const
{
return _imp->category_name_part_ptr;
}
-tr1::shared_ptr<const VersionRequirements>
+std::tr1::shared_ptr<const VersionRequirements>
PythonPackageDepSpec::version_requirements_ptr() const
{
return _imp->version_requirements;
@@ -387,25 +387,25 @@ PythonPackageDepSpec::set_version_requirements_mode(const VersionRequirementsMod
_imp->version_requirements_mode = m;
}
-tr1::shared_ptr<const SlotRequirement>
+std::tr1::shared_ptr<const SlotRequirement>
PythonPackageDepSpec::slot_requirement_ptr() const
{
return _imp->slot;
}
-tr1::shared_ptr<const RepositoryName>
+std::tr1::shared_ptr<const RepositoryName>
PythonPackageDepSpec::repository_ptr() const
{
return _imp->repository;
}
-tr1::shared_ptr<const AdditionalPackageDepSpecRequirements>
+std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements>
PythonPackageDepSpec::additional_requirements_ptr() const
{
return _imp->additional_requirements;
}
-tr1::shared_ptr<const DepTag>
+std::tr1::shared_ptr<const DepTag>
PythonPackageDepSpec::tag() const
{
return _imp->tag;
@@ -418,7 +418,7 @@ PythonPackageDepSpec::py_str() const
}
void
-PythonPackageDepSpec::set_tag(const tr1::shared_ptr<const DepTag> & s)
+PythonPackageDepSpec::set_tag(const std::tr1::shared_ptr<const DepTag> & s)
{
_imp->tag = s;
}
@@ -476,7 +476,7 @@ PythonSimpleURIDepSpec::PythonSimpleURIDepSpec(const SimpleURIDepSpec & d) :
{
}
-PythonBlockDepSpec::PythonBlockDepSpec(tr1::shared_ptr<const PythonPackageDepSpec> & a) :
+PythonBlockDepSpec::PythonBlockDepSpec(std::tr1::shared_ptr<const PythonPackageDepSpec> & a) :
PythonStringDepSpec("!" + a->text()),
_spec(a)
{
@@ -488,7 +488,7 @@ PythonBlockDepSpec::PythonBlockDepSpec(const BlockDepSpec & d) :
{
}
-tr1::shared_ptr<const PythonPackageDepSpec>
+std::tr1::shared_ptr<const PythonPackageDepSpec>
PythonBlockDepSpec::blocked_spec() const
{
return _spec;
@@ -554,9 +554,9 @@ SpecTreeToPython::visit_sequence(const AllDepSpec & d,
GenericSpecTree::ConstSequenceIterator cur,
GenericSpecTree::ConstSequenceIterator end)
{
- tr1::shared_ptr<PythonAllDepSpec> py_cds(new PythonAllDepSpec(d));
+ std::tr1::shared_ptr<PythonAllDepSpec> py_cds(new PythonAllDepSpec(d));
_current_parent->add_child(py_cds);
- Save<tr1::shared_ptr<PythonCompositeDepSpec> > old_parent(&_current_parent, py_cds);
+ Save<std::tr1::shared_ptr<PythonCompositeDepSpec> > old_parent(&_current_parent, py_cds);
std::for_each(cur, end, accept_visitor(*this));
}
@@ -565,9 +565,9 @@ SpecTreeToPython::visit_sequence(const AnyDepSpec & d,
GenericSpecTree::ConstSequenceIterator cur,
GenericSpecTree::ConstSequenceIterator end)
{
- tr1::shared_ptr<PythonAnyDepSpec> py_cds(new PythonAnyDepSpec(d));
+ std::tr1::shared_ptr<PythonAnyDepSpec> py_cds(new PythonAnyDepSpec(d));
_current_parent->add_child(py_cds);
- Save<tr1::shared_ptr<PythonCompositeDepSpec> > old_parent(&_current_parent, py_cds);
+ Save<std::tr1::shared_ptr<PythonCompositeDepSpec> > old_parent(&_current_parent, py_cds);
std::for_each(cur, end, accept_visitor(*this));
}
@@ -576,9 +576,9 @@ SpecTreeToPython::visit_sequence(const ConditionalDepSpec & d,
GenericSpecTree::ConstSequenceIterator cur,
GenericSpecTree::ConstSequenceIterator end)
{
- tr1::shared_ptr<PythonConditionalDepSpec> py_cds(new PythonConditionalDepSpec(d));
+ std::tr1::shared_ptr<PythonConditionalDepSpec> py_cds(new PythonConditionalDepSpec(d));
_current_parent->add_child(py_cds);
- Save<tr1::shared_ptr<PythonCompositeDepSpec> > old_parent(&_current_parent, py_cds);
+ Save<std::tr1::shared_ptr<PythonCompositeDepSpec> > old_parent(&_current_parent, py_cds);
std::for_each(cur, end, accept_visitor(*this));
}
@@ -636,7 +636,7 @@ SpecTreeToPython::visit_leaf(const DependencyLabelsDepSpec & d)
_current_parent->add_child(make_shared_ptr(new PythonDependencyLabelsDepSpec(d)));
}
-const tr1::shared_ptr<const PythonDepSpec>
+const std::tr1::shared_ptr<const PythonDepSpec>
SpecTreeToPython::result() const
{
return *_current_parent->begin();
@@ -746,13 +746,13 @@ Dispatcher<H_, D_, PyD_, false>::do_dispatch(SpecTreeFromPython<H_> *, const PyD
template <typename H_, typename D_, typename PyD_>
void dispatch(SpecTreeFromPython<H_> * const v, const PyD_ & d)
{
- Dispatcher<H_, D_, PyD_, tr1::is_convertible<D_, AllowedTypes<H_> >::value>::do_dispatch(v, d);
+ Dispatcher<H_, D_, PyD_, std::tr1::is_convertible<D_, AllowedTypes<H_> >::value>::do_dispatch(v, d);
}
template <typename H_>
SpecTreeFromPython<H_>::SpecTreeFromPython() :
- _result(new ConstTreeSequence<H_, AllDepSpec>(tr1::shared_ptr<AllDepSpec>(new AllDepSpec()))),
- _add(tr1::bind(&ConstTreeSequence<H_, AllDepSpec>::add, _result, tr1::placeholders::_1))
+ _result(new ConstTreeSequence<H_, AllDepSpec>(std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec()))),
+ _add(std::tr1::bind(&ConstTreeSequence<H_, AllDepSpec>::add, _result, std::tr1::placeholders::_1))
{
}
@@ -849,13 +849,13 @@ template <typename H_>
void
SpecTreeFromPython<H_>::real_visit(const PythonAllDepSpec & d)
{
- tr1::shared_ptr<ConstTreeSequence<H_, AllDepSpec> > cds(
+ std::tr1::shared_ptr<ConstTreeSequence<H_, AllDepSpec> > cds(
new ConstTreeSequence<H_, AllDepSpec>(make_shared_ptr(new AllDepSpec())));
_add(cds);
- Save<tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> > old_add(&_add,
- tr1::bind(&ConstTreeSequence<H_, AllDepSpec>::add, cds, tr1::placeholders::_1));
+ Save<std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> > old_add(&_add,
+ std::tr1::bind(&ConstTreeSequence<H_, AllDepSpec>::add, cds, std::tr1::placeholders::_1));
std::for_each(IndirectIterator<PythonCompositeDepSpec::ConstIterator, const PythonDepSpec>(d.begin()),
IndirectIterator<PythonCompositeDepSpec::ConstIterator, const PythonDepSpec>(d.end()),
accept_visitor(*this));
@@ -865,13 +865,13 @@ template <typename H_>
void
SpecTreeFromPython<H_>::real_visit(const PythonAnyDepSpec & d)
{
- tr1::shared_ptr<ConstTreeSequence<H_, AnyDepSpec> > cds(
+ std::tr1::shared_ptr<ConstTreeSequence<H_, AnyDepSpec> > cds(
new ConstTreeSequence<H_, AnyDepSpec>(make_shared_ptr(new AnyDepSpec())));
_add(cds);
- Save<tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> > old_add(&_add,
- tr1::bind(&ConstTreeSequence<H_, AnyDepSpec>::add, cds, tr1::placeholders::_1));
+ Save<std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> > old_add(&_add,
+ std::tr1::bind(&ConstTreeSequence<H_, AnyDepSpec>::add, cds, std::tr1::placeholders::_1));
std::for_each(IndirectIterator<PythonCompositeDepSpec::ConstIterator, const PythonDepSpec>(d.begin()),
IndirectIterator<PythonCompositeDepSpec::ConstIterator, const PythonDepSpec>(d.end()),
accept_visitor(*this));
@@ -881,14 +881,14 @@ template <typename H_>
void
SpecTreeFromPython<H_>::real_visit(const PythonConditionalDepSpec & d)
{
- tr1::shared_ptr<ConstTreeSequence<H_, ConditionalDepSpec> > cds(
+ std::tr1::shared_ptr<ConstTreeSequence<H_, ConditionalDepSpec> > cds(
new ConstTreeSequence<H_, ConditionalDepSpec>(make_shared_ptr(
new ConditionalDepSpec(d.data()))));
_add(cds);
- Save<tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> > old_add(&_add,
- tr1::bind(&ConstTreeSequence<H_, ConditionalDepSpec>::add, cds, tr1::placeholders::_1));
+ Save<std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> > old_add(&_add,
+ std::tr1::bind(&ConstTreeSequence<H_, ConditionalDepSpec>::add, cds, std::tr1::placeholders::_1));
std::for_each(IndirectIterator<PythonCompositeDepSpec::ConstIterator, const PythonDepSpec>(d.begin()),
IndirectIterator<PythonCompositeDepSpec::ConstIterator, const PythonDepSpec>(d.end()),
accept_visitor(*this));
@@ -961,7 +961,7 @@ SpecTreeFromPython<H_>::real_visit(const PythonBlockDepSpec & d)
}
template <typename H_>
-tr1::shared_ptr<typename H_::ConstItem>
+std::tr1::shared_ptr<typename H_::ConstItem>
SpecTreeFromPython<H_>::result() const
{
return _result;
@@ -972,11 +972,11 @@ struct RegisterSpecTreeToPython
{
RegisterSpecTreeToPython()
{
- bp::to_python_converter<tr1::shared_ptr<typename T_::ConstItem>, RegisterSpecTreeToPython<T_> >();
+ bp::to_python_converter<std::tr1::shared_ptr<typename T_::ConstItem>, RegisterSpecTreeToPython<T_> >();
}
static PyObject *
- convert(const tr1::shared_ptr<typename T_::ConstItem> & n)
+ convert(const std::tr1::shared_ptr<typename T_::ConstItem> & n)
{
SpecTreeToPython v;
n->accept(v);
@@ -990,7 +990,7 @@ struct RegisterDepSpecToPython
RegisterDepSpecToPython()
{
bp::to_python_converter<From_, RegisterDepSpecToPython<From_, To_> >();
- bp::to_python_converter<tr1::shared_ptr<const From_>, RegisterDepSpecToPython<From_, To_> >();
+ bp::to_python_converter<std::tr1::shared_ptr<const From_>, RegisterDepSpecToPython<From_, To_> >();
}
static PyObject *
@@ -1001,7 +1001,7 @@ struct RegisterDepSpecToPython
}
static PyObject *
- convert(const tr1::shared_ptr<const From_> & d)
+ convert(const std::tr1::shared_ptr<const From_> & d)
{
To_ pyd(*d);
return bp::incref(bp::object(pyd).ptr());
@@ -1014,7 +1014,7 @@ struct RegisterSpecTreeSharedPtrFromPython
RegisterSpecTreeSharedPtrFromPython()
{
bp::converter::registry::push_back(&convertible, &construct,
- boost::python::type_id<tr1::shared_ptr<const typename H_::ConstItem> >());
+ boost::python::type_id<std::tr1::shared_ptr<const typename H_::ConstItem> >());
}
static void *
@@ -1029,14 +1029,14 @@ struct RegisterSpecTreeSharedPtrFromPython
static void
construct(PyObject * obj_ptr, bp::converter::rvalue_from_python_stage1_data * data)
{
- typedef bp::converter::rvalue_from_python_storage<tr1::shared_ptr<const typename H_::ConstItem> > Storage;
+ typedef bp::converter::rvalue_from_python_storage<std::tr1::shared_ptr<const typename H_::ConstItem> > Storage;
void * storage = reinterpret_cast<Storage *>(data)->storage.bytes;
SpecTreeFromPython<H_> v;
PythonDepSpec * p = bp::extract<PythonDepSpec *>(obj_ptr);
p->accept(v);
- new (storage) tr1::shared_ptr<const typename H_::ConstItem>(v.result());
+ new (storage) std::tr1::shared_ptr<const typename H_::ConstItem>(v.result());
data->convertible = storage;
}
};
@@ -1184,11 +1184,11 @@ void expose_dep_spec()
);
bp::implicitly_convertible<PythonPackageDepSpec, PackageDepSpec>();
- bp::implicitly_convertible<PythonPackageDepSpec, tr1::shared_ptr<PackageDepSpec> >();
- bp::implicitly_convertible<tr1::shared_ptr<PackageDepSpec>, tr1::shared_ptr<const PackageDepSpec> >();
+ bp::implicitly_convertible<PythonPackageDepSpec, std::tr1::shared_ptr<PackageDepSpec> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<PackageDepSpec>, std::tr1::shared_ptr<const PackageDepSpec> >();
RegisterDepSpecToPython<PackageDepSpec, PythonPackageDepSpec>();
- bp::class_<PythonPackageDepSpec, tr1::shared_ptr<const PythonPackageDepSpec>, bp::bases<PythonStringDepSpec> >
+ bp::class_<PythonPackageDepSpec, std::tr1::shared_ptr<const PythonPackageDepSpec>, bp::bases<PythonStringDepSpec> >
(
"PackageDepSpec",
"A PackageDepSpec represents a package name (for example, 'app-editors/vim'),"
@@ -1355,7 +1355,7 @@ void expose_dep_spec()
"BlockDepSpec",
"A BlockDepSpec represents a block on a package name (for example, 'app-editors/vim'), \n"
"possibly with associated version and SLOT restrictions.",
- bp::init<tr1::shared_ptr<const PackageDepSpec> >("__init__(PackageDepSpec)")
+ bp::init<std::tr1::shared_ptr<const PackageDepSpec> >("__init__(PackageDepSpec)")
)
.add_property("blocked_spec", &PythonBlockDepSpec::blocked_spec,
"[ro] PackageDepSpec\n"
diff --git a/python/dep_spec.hh b/python/dep_spec.hh
index 7a5ed7062..a2c64d3cc 100644
--- a/python/dep_spec.hh
+++ b/python/dep_spec.hh
@@ -22,7 +22,7 @@
#include <paludis/dep_spec.hh>
#include <paludis/dep_tree.hh>
-#include <paludis/util/tr1_functional.hh>
+#include <tr1/functional>
namespace paludis
{
@@ -91,10 +91,10 @@ namespace paludis
public:
~PythonCompositeDepSpec();
- void add_child(const tr1::shared_ptr<const PythonDepSpec>);
+ void add_child(const std::tr1::shared_ptr<const PythonDepSpec>);
struct ConstIteratorTag;
- typedef WrappedForwardIterator<ConstIteratorTag, const tr1::shared_ptr<const PythonDepSpec> > ConstIterator;
+ typedef WrappedForwardIterator<ConstIteratorTag, const std::tr1::shared_ptr<const PythonDepSpec> > ConstIterator;
ConstIterator begin() const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -125,7 +125,7 @@ namespace paludis
public ConstAcceptInterfaceVisitsThis<PythonDepSpecVisitorTypes, PythonConditionalDepSpec>
{
private:
- const tr1::shared_ptr<const ConditionalDepSpecData> _data;
+ const std::tr1::shared_ptr<const ConditionalDepSpecData> _data;
public:
PythonConditionalDepSpec(const ConditionalDepSpec &);
@@ -135,7 +135,7 @@ namespace paludis
bool condition_met() const PALUDIS_ATTRIBUTE((warn_unused_result));
bool condition_meetable() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const tr1::shared_ptr<const ConditionalDepSpecData> data() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::tr1::shared_ptr<const ConditionalDepSpecData> data() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
class PALUDIS_VISIBLE PythonStringDepSpec :
@@ -166,20 +166,20 @@ namespace paludis
~PythonPackageDepSpec();
operator PackageDepSpec() const;
- operator tr1::shared_ptr<PackageDepSpec>() const;
+ operator std::tr1::shared_ptr<PackageDepSpec>() const;
- tr1::shared_ptr<const QualifiedPackageName> package_ptr() const;
- tr1::shared_ptr<const PackageNamePart> package_name_part_ptr() const;
- tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr() const;
- tr1::shared_ptr<const VersionRequirements> version_requirements_ptr() const;
+ std::tr1::shared_ptr<const QualifiedPackageName> package_ptr() const;
+ std::tr1::shared_ptr<const PackageNamePart> package_name_part_ptr() const;
+ std::tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr() const;
+ std::tr1::shared_ptr<const VersionRequirements> version_requirements_ptr() const;
VersionRequirementsMode version_requirements_mode() const;
void set_version_requirements_mode(const VersionRequirementsMode m);
- tr1::shared_ptr<const SlotRequirement> slot_requirement_ptr() const;
- tr1::shared_ptr<const RepositoryName> repository_ptr() const;
- tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const;
- tr1::shared_ptr<const DepTag> tag() const;
- void set_tag(const tr1::shared_ptr<const DepTag> & s);
- const tr1::shared_ptr<const PythonPackageDepSpec> without_additional_requirements() const;
+ std::tr1::shared_ptr<const SlotRequirement> slot_requirement_ptr() const;
+ std::tr1::shared_ptr<const RepositoryName> repository_ptr() const;
+ std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const;
+ std::tr1::shared_ptr<const DepTag> tag() const;
+ void set_tag(const std::tr1::shared_ptr<const DepTag> & s);
+ const std::tr1::shared_ptr<const PythonPackageDepSpec> without_additional_requirements() const;
std::string py_str() const;
@@ -245,13 +245,13 @@ namespace paludis
public ConstAcceptInterfaceVisitsThis<PythonDepSpecVisitorTypes, PythonBlockDepSpec>
{
private:
- tr1::shared_ptr<const PythonPackageDepSpec> _spec;
+ std::tr1::shared_ptr<const PythonPackageDepSpec> _spec;
public:
- PythonBlockDepSpec(tr1::shared_ptr<const PythonPackageDepSpec> &);
+ PythonBlockDepSpec(std::tr1::shared_ptr<const PythonPackageDepSpec> &);
PythonBlockDepSpec(const BlockDepSpec &);
- tr1::shared_ptr<const PythonPackageDepSpec> blocked_spec() const;
+ std::tr1::shared_ptr<const PythonPackageDepSpec> blocked_spec() const;
};
class PALUDIS_VISIBLE PythonURILabelsDepSpec :
@@ -280,14 +280,14 @@ namespace paludis
private InstantiationPolicy<SpecTreeToPython, instantiation_method::NonCopyableTag>
{
private:
- tr1::shared_ptr<PythonCompositeDepSpec> _current_parent;
+ std::tr1::shared_ptr<PythonCompositeDepSpec> _current_parent;
public:
SpecTreeToPython();
virtual ~SpecTreeToPython();
- const tr1::shared_ptr<const PythonDepSpec> result() const;
+ const std::tr1::shared_ptr<const PythonDepSpec> result() const;
void visit_sequence(const AllDepSpec &,
GenericSpecTree::ConstSequenceIterator,
@@ -329,15 +329,15 @@ namespace paludis
private InstantiationPolicy<SpecTreeFromPython<H_>, instantiation_method::NonCopyableTag>
{
private:
- tr1::shared_ptr<ConstTreeSequence<H_, AllDepSpec> > _result;
- tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> _add;
+ std::tr1::shared_ptr<ConstTreeSequence<H_, AllDepSpec> > _result;
+ std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> _add;
public:
SpecTreeFromPython();
virtual ~SpecTreeFromPython();
- tr1::shared_ptr<typename H_::ConstItem> result() const;
+ std::tr1::shared_ptr<typename H_::ConstItem> result() const;
void visit(const PythonAllDepSpec &);
void visit(const PythonAnyDepSpec &);
diff --git a/python/dep_tag.cc b/python/dep_tag.cc
index 1ef99d6c2..4cb746b58 100644
--- a/python/dep_tag.cc
+++ b/python/dep_tag.cc
@@ -32,7 +32,7 @@ namespace bp = boost::python;
struct DepTagCategoryMakerWrapper
{
// More convenient way of creating DepTagCategories
- static tr1::shared_ptr<const DepTagCategory>
+ static std::tr1::shared_ptr<const DepTagCategory>
make_from_id(const DepTagCategoryMaker & self, const std::string & id)
{
return self[id]();
@@ -168,8 +168,8 @@ void expose_dep_tag()
(
"DependencyDepTag",
"DepTag subclass for dependencies.",
- bp::init<const tr1::shared_ptr<const PackageID> &, const PackageDepSpec &,
- const tr1::shared_ptr<const DependencySpecTree::ConstItem> >(
+ bp::init<const std::tr1::shared_ptr<const PackageID> &, const PackageDepSpec &,
+ const std::tr1::shared_ptr<const DependencySpecTree::ConstItem> >(
"__init__(PackageID, PackageDepSpec, CompositeDepSpec)"
)
)
diff --git a/python/environment.cc b/python/environment.cc
index 84c21d80a..51e7f48cf 100644
--- a/python/environment.cc
+++ b/python/environment.cc
@@ -41,13 +41,13 @@ class EnvironmentImplementationWrapper :
public bp::wrapper<EnvironmentImplementation>
{
private:
- tr1::shared_ptr<PackageDatabase> _db;
+ std::tr1::shared_ptr<PackageDatabase> _db;
protected:
- virtual tr1::shared_ptr<SetSpecTree::ConstItem> local_set(const SetName & s) const
+ virtual std::tr1::shared_ptr<SetSpecTree::ConstItem> local_set(const SetName & s) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
- return tr1::shared_ptr<SetSpecTree::ConstItem>();
+ return std::tr1::shared_ptr<SetSpecTree::ConstItem>();
}
public:
@@ -72,7 +72,7 @@ class EnvironmentImplementationWrapper :
return EnvironmentImplementation::query_use(u, p);
}
- virtual tr1::shared_ptr<const UseFlagNameSet> known_use_expand_names(
+ virtual std::tr1::shared_ptr<const UseFlagNameSet> known_use_expand_names(
const UseFlagName & u, const PackageID & p) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
@@ -95,7 +95,7 @@ class EnvironmentImplementationWrapper :
throw PythonMethodNotImplemented("EnvironmentImplementation", "accept_license");
}
- virtual bool accept_keywords(tr1::shared_ptr<const KeywordNameSet> k, const PackageID & p) const
+ virtual bool accept_keywords(std::tr1::shared_ptr<const KeywordNameSet> k, const PackageID & p) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -106,7 +106,7 @@ class EnvironmentImplementationWrapper :
throw PythonMethodNotImplemented("EnvironmentImplementation", "accept_keywords");
}
- virtual const tr1::shared_ptr<const Mask> mask_for_breakage(const PackageID & p) const
+ virtual const std::tr1::shared_ptr<const Mask> mask_for_breakage(const PackageID & p) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -117,7 +117,7 @@ class EnvironmentImplementationWrapper :
throw PythonMethodNotImplemented("EnvironmentImplementation", "mask_for_breakage");
}
- virtual const tr1::shared_ptr<const Mask> mask_for_user(const PackageID & p) const
+ virtual const std::tr1::shared_ptr<const Mask> mask_for_user(const PackageID & p) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -139,19 +139,19 @@ class EnvironmentImplementationWrapper :
throw PythonMethodNotImplemented("EnvironmentImplementation", "unmasked_by_user");
}
- virtual tr1::shared_ptr<PackageDatabase> package_database()
+ virtual std::tr1::shared_ptr<PackageDatabase> package_database()
PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _db;
}
- virtual tr1::shared_ptr<const PackageDatabase> package_database() const
+ virtual std::tr1::shared_ptr<const PackageDatabase> package_database() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _db;
}
- virtual tr1::shared_ptr<const FSEntrySequence> bashrc_files() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> bashrc_files() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -161,13 +161,13 @@ class EnvironmentImplementationWrapper :
return EnvironmentImplementation::bashrc_files();
}
- tr1::shared_ptr<const FSEntrySequence> default_bashrc_files() const
+ std::tr1::shared_ptr<const FSEntrySequence> default_bashrc_files() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
return EnvironmentImplementation::bashrc_files();
}
- virtual tr1::shared_ptr<const FSEntrySequence> syncers_dirs() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> syncers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -177,13 +177,13 @@ class EnvironmentImplementationWrapper :
return EnvironmentImplementation::syncers_dirs();
}
- tr1::shared_ptr<const FSEntrySequence> default_syncers_dirs() const
+ std::tr1::shared_ptr<const FSEntrySequence> default_syncers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
return EnvironmentImplementation::syncers_dirs();
}
- virtual tr1::shared_ptr<const FSEntrySequence> fetchers_dirs() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> fetchers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -193,13 +193,13 @@ class EnvironmentImplementationWrapper :
return EnvironmentImplementation::fetchers_dirs();
}
- tr1::shared_ptr<const FSEntrySequence> default_fetchers_dirs() const
+ std::tr1::shared_ptr<const FSEntrySequence> default_fetchers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
return EnvironmentImplementation::fetchers_dirs();
}
- virtual tr1::shared_ptr<const FSEntrySequence> hook_dirs() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> hook_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -262,7 +262,7 @@ class EnvironmentImplementationWrapper :
}
- virtual tr1::shared_ptr<const MirrorsSequence> mirrors(const std::string & s) const
+ virtual std::tr1::shared_ptr<const MirrorsSequence> mirrors(const std::string & s) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -273,7 +273,7 @@ class EnvironmentImplementationWrapper :
throw PythonMethodNotImplemented("EnvironmentImplementation", "mirrors");
}
- virtual tr1::shared_ptr<const SetNameSet> set_names() const
+ virtual std::tr1::shared_ptr<const SetNameSet> set_names() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -283,13 +283,13 @@ class EnvironmentImplementationWrapper :
return EnvironmentImplementation::set_names();
}
- tr1::shared_ptr<const SetNameSet> default_set_names() const
+ std::tr1::shared_ptr<const SetNameSet> default_set_names() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
return EnvironmentImplementation::set_names();
}
- virtual tr1::shared_ptr<SetSpecTree::ConstItem> set(const SetName & s) const
+ virtual std::tr1::shared_ptr<SetSpecTree::ConstItem> set(const SetName & s) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -299,13 +299,13 @@ class EnvironmentImplementationWrapper :
return EnvironmentImplementation::set(s);
}
- tr1::shared_ptr<SetSpecTree::ConstItem> default_set(const SetName & s) const
+ std::tr1::shared_ptr<SetSpecTree::ConstItem> default_set(const SetName & s) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
return EnvironmentImplementation::set(s);
}
- virtual tr1::shared_ptr<const DestinationsSet> default_destinations() const
+ virtual std::tr1::shared_ptr<const DestinationsSet> default_destinations() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -315,7 +315,7 @@ class EnvironmentImplementationWrapper :
return EnvironmentImplementation::default_destinations();
}
- tr1::shared_ptr<const DestinationsSet> default_default_destinations() const
+ std::tr1::shared_ptr<const DestinationsSet> default_default_destinations() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
return EnvironmentImplementation::default_destinations();
@@ -380,7 +380,7 @@ class EnvironmentImplementationWrapper :
throw PythonMethodNotImplemented("EnvironmentImplementation", "remove_from_world");
}
- virtual tr1::shared_ptr<SetSpecTree::ConstItem> world_set() const
+ virtual std::tr1::shared_ptr<SetSpecTree::ConstItem> world_set() const
{
Lock l(get_mutex());
if (bp::override f = get_override("world_set"))
@@ -396,7 +396,7 @@ struct NoConfigEnvironmentWrapper :
NoConfigEnvironmentWrapper(const FSEntry & env_dir, const FSEntry & cache_dir,
const FSEntry & master_repo_dir) :
NoConfigEnvironment(no_config_environment::Params(env_dir, cache_dir, false, false,
- no_config_environment::ncer_auto, master_repo_dir, tr1::shared_ptr<Map<std::string, std::string> >())
+ no_config_environment::ncer_auto, master_repo_dir, std::tr1::shared_ptr<Map<std::string, std::string> >())
)
{
}
@@ -456,9 +456,9 @@ void expose_environment()
/**
* Environment
*/
- tr1::shared_ptr<PackageDatabase> (Environment::* package_database)() =
+ std::tr1::shared_ptr<PackageDatabase> (Environment::* package_database)() =
&Environment::package_database;
- bp::class_<Environment, tr1::shared_ptr<Environment>, boost::noncopyable>
+ bp::class_<Environment, std::tr1::shared_ptr<Environment>, boost::noncopyable>
(
"Environment",
"Represents a working environment, which contains an available packages database\n"
@@ -502,7 +502,7 @@ void expose_environment()
*/
typedef EnvironmentImplementation EnvImp;
typedef EnvironmentImplementationWrapper EnvImpW;
- bp::class_<EnvironmentImplementationWrapper, tr1::shared_ptr<EnvironmentImplementationWrapper>,
+ bp::class_<EnvironmentImplementationWrapper, std::tr1::shared_ptr<EnvironmentImplementationWrapper>,
bp::bases<Environment>, boost::noncopyable>
(
"EnvironmentImplementation",
@@ -639,7 +639,7 @@ void expose_environment()
"AdaptedEnvironment",
"An Environment that allows you to change aspects of an existing Environment,"
" e.g. the state of a USE flag for a package.",
- bp::init<tr1::shared_ptr<Environment> >("__init__(Environment)")
+ bp::init<std::tr1::shared_ptr<Environment> >("__init__(Environment)")
)
.def("adapt_use", &AdaptedEnvironment::adapt_use,
"adapt_use(PackageDepSpeec, UseFlagName, UseFlagState)\n"
@@ -670,9 +670,9 @@ void expose_environment()
/**
* NoConfigEnvironment
*/
- tr1::shared_ptr<Repository> (NoConfigEnvironment::*main_repository)()
+ std::tr1::shared_ptr<Repository> (NoConfigEnvironment::*main_repository)()
= &NoConfigEnvironment::main_repository;
- tr1::shared_ptr<Repository> (NoConfigEnvironment::*master_repository)()
+ std::tr1::shared_ptr<Repository> (NoConfigEnvironment::*master_repository)()
= &NoConfigEnvironment::master_repository;
bp::class_<NoConfigEnvironmentWrapper, bp::bases<Environment>, boost::noncopyable>
(
diff --git a/python/exception.cc b/python/exception.cc
index 0040b5040..da5e05a15 100644
--- a/python/exception.cc
+++ b/python/exception.cc
@@ -40,9 +40,9 @@ namespace paludis
template<>
struct Implementation<ExceptionRegister>
{
- std::map<std::string, tr1::shared_ptr<RegisteredExceptionBase> > exceptions;
+ std::map<std::string, std::tr1::shared_ptr<RegisteredExceptionBase> > exceptions;
};
- typedef std::map<std::string, tr1::shared_ptr<RegisteredExceptionBase> >::iterator ExceptionsIterator;
+ typedef std::map<std::string, std::tr1::shared_ptr<RegisteredExceptionBase> >::iterator ExceptionsIterator;
}
ExceptionRegister::ExceptionRegister() :
@@ -55,7 +55,7 @@ ExceptionRegister::~ExceptionRegister()
}
void
-ExceptionRegister::add_map_item(const std::string & name, tr1::shared_ptr<RegisteredExceptionBase> p)
+ExceptionRegister::add_map_item(const std::string & name, std::tr1::shared_ptr<RegisteredExceptionBase> p)
{
_imp->exceptions.insert(std::make_pair(name, p));
}
diff --git a/python/exception.hh b/python/exception.hh
index b4a173f6d..6eb09f0f1 100644
--- a/python/exception.hh
+++ b/python/exception.hh
@@ -20,12 +20,11 @@
#ifndef PALUDIS_GUARD_PYTHON_EXCEPTION_HH
#define PALUDIS_GUARD_PYTHON_EXCEPTION_HH 1
-#include <paludis/util/tr1_memory.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/exception.hh>
-
#include <boost/python.hpp>
+#include <tr1/memory>
+#include <tr1/functional>
namespace paludis
{
@@ -67,14 +66,11 @@ namespace paludis
_longname("paludis." + name),
_e(PyErr_NewException(const_cast<char*>(_longname.c_str()), base, NULL))
{
- using namespace tr1::placeholders;
PyModule_AddObject(boost::python::detail::current_scope, const_cast<char*>(_name.c_str()), _e);
PyObject * doc_string = PyString_FromString(doc.c_str());
PyObject_SetAttrString(_e, "__doc__", doc_string);
boost::python::register_exception_translator<Ex_>(
- tr1::bind(tr1::mem_fn(&RegisteredException<Ex_>::translator),
- this, _1)
- );
+ std::tr1::bind(std::tr1::mem_fn(&RegisteredException<Ex_>::translator), this, std::tr1::placeholders::_1));
}
template <class Ex_>
@@ -100,7 +96,7 @@ namespace paludis
private:
ExceptionRegister();
- void add_map_item(const std::string & name, tr1::shared_ptr<RegisteredExceptionBase>);
+ void add_map_item(const std::string & name, std::tr1::shared_ptr<RegisteredExceptionBase>);
PyObject * get_py_exception(const std::string & name);
public:
@@ -109,14 +105,14 @@ namespace paludis
template <typename Ex_>
void add_exception(const std::string & name, const std::string & doc)
{
- add_map_item(name, tr1::shared_ptr<RegisteredExceptionBase>(
+ add_map_item(name, std::tr1::shared_ptr<RegisteredExceptionBase>(
new RegisteredException<Ex_>(name, doc, 0)));
}
template <typename Ex_>
void add_exception(const std::string & name, const std::string & base, const std::string & doc)
{
- add_map_item(name, tr1::shared_ptr<RegisteredExceptionBase>(
+ add_map_item(name, std::tr1::shared_ptr<RegisteredExceptionBase>(
new RegisteredException<Ex_>(name, doc, get_py_exception(base))));
}
};
diff --git a/python/iterable.hh b/python/iterable.hh
index 6a2dc534a..90553745d 100644
--- a/python/iterable.hh
+++ b/python/iterable.hh
@@ -23,10 +23,10 @@
#include <python/paludis_python.hh>
#include <python/exception.hh>
-#include <paludis/util/tr1_type_traits.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
#include <paludis/util/validated.hh>
+#include <tr1/type_traits>
namespace paludis
{
@@ -35,13 +35,13 @@ namespace paludis
template <typename From_, typename To_>
struct IsConvertible
{
- static const bool value = tr1::is_convertible<From_, To_>::value;
+ static const bool value = std::tr1::is_convertible<From_, To_>::value;
};
template <typename From_, typename ValidatedDataType_, typename Validator_, bool full_comparison_, typename Comparator_>
struct IsConvertible<From_, Validated<ValidatedDataType_, Validator_, full_comparison_, Comparator_> >
{
- static const bool value = tr1::is_convertible<From_, ValidatedDataType_>::value;
+ static const bool value = std::tr1::is_convertible<From_, ValidatedDataType_>::value;
};
template <typename To_, typename From_, typename C_, bool>
@@ -80,7 +80,7 @@ namespace paludis
RegisterSequenceSPTRFromPython(const std::string & name)
{
boost::python::converter::registry::push_back(&convertible, &construct,
- boost::python::type_id<tr1::shared_ptr<Sequence<V_> > >());
+ boost::python::type_id<std::tr1::shared_ptr<Sequence<V_> > >());
_name = name;
}
@@ -98,7 +98,7 @@ namespace paludis
static void
construct(PyObject * obj_ptr, boost::python::converter::rvalue_from_python_stage1_data * data)
{
- typedef boost::python::converter::rvalue_from_python_storage<tr1::shared_ptr<Sequence<V_> > >
+ typedef boost::python::converter::rvalue_from_python_storage<std::tr1::shared_ptr<Sequence<V_> > >
Storage;
void * storage = reinterpret_cast<Storage *>(data)->storage.bytes;
@@ -106,13 +106,13 @@ namespace paludis
if (obj_ptr == Py_None)
{
- new (storage) tr1::shared_ptr<Sequence<V_> >();
+ new (storage) std::tr1::shared_ptr<Sequence<V_> >();
return;
}
else
- new (storage) tr1::shared_ptr<Sequence<V_> >(new Sequence<V_>());
+ new (storage) std::tr1::shared_ptr<Sequence<V_> >(new Sequence<V_>());
- Sequence<V_> * s(reinterpret_cast<tr1::shared_ptr<Sequence<V_> > *>(storage)->get());
+ Sequence<V_> * s(reinterpret_cast<std::tr1::shared_ptr<Sequence<V_> > *>(storage)->get());
boost::python::list l = boost::python::extract<boost::python::list>(obj_ptr);
@@ -131,7 +131,7 @@ namespace paludis
}
else
{
- typedef tr1::shared_ptr<Sequence<V_> > sptr;
+ typedef std::tr1::shared_ptr<Sequence<V_> > sptr;
reinterpret_cast<sptr *>(storage)->sptr::~shared_ptr();
throw PythonContainerConversionError(_name, "sequence", o.ptr()->ob_type->tp_name);
@@ -150,7 +150,7 @@ namespace paludis
RegisterSetSPTRFromPython(const std::string & name)
{
boost::python::converter::registry::push_back(&convertible, &construct,
- boost::python::type_id<tr1::shared_ptr<Set<V_> > >());
+ boost::python::type_id<std::tr1::shared_ptr<Set<V_> > >());
_name = name;
}
@@ -168,7 +168,7 @@ namespace paludis
static void
construct(PyObject * obj_ptr, boost::python::converter::rvalue_from_python_stage1_data * data)
{
- typedef boost::python::converter::rvalue_from_python_storage<tr1::shared_ptr<Set<V_> > >
+ typedef boost::python::converter::rvalue_from_python_storage<std::tr1::shared_ptr<Set<V_> > >
Storage;
void * storage = reinterpret_cast<Storage *>(data)->storage.bytes;
@@ -176,13 +176,13 @@ namespace paludis
if (obj_ptr == Py_None)
{
- new (storage) tr1::shared_ptr<Set<V_> >();
+ new (storage) std::tr1::shared_ptr<Set<V_> >();
return;
}
else
- new (storage) tr1::shared_ptr<Set<V_> >(new Set<V_>());
+ new (storage) std::tr1::shared_ptr<Set<V_> >(new Set<V_>());
- Set<V_> * s(reinterpret_cast<tr1::shared_ptr<Set<V_> > *>(storage)->get());
+ Set<V_> * s(reinterpret_cast<std::tr1::shared_ptr<Set<V_> > *>(storage)->get());
boost::python::list l = boost::python::extract<boost::python::list>(obj_ptr);
@@ -201,7 +201,7 @@ namespace paludis
}
else
{
- typedef tr1::shared_ptr<Set<V_> > sptr;
+ typedef std::tr1::shared_ptr<Set<V_> > sptr;
reinterpret_cast<sptr *>(storage)->sptr::~shared_ptr();
throw PythonContainerConversionError(_name, "set", o.ptr()->ob_type->tp_name);
@@ -227,9 +227,9 @@ namespace paludis
if (converter)
{
- if (tr1::is_same<C_, Sequence<typename C_::value_type> >::value)
+ if (std::tr1::is_same<C_, Sequence<typename C_::value_type> >::value)
RegisterSequenceSPTRFromPython<typename C_::value_type> tmp(name);
- else if (tr1::is_same<C_, Set<typename C_::value_type> >::value)
+ else if (std::tr1::is_same<C_, Set<typename C_::value_type> >::value)
RegisterSetSPTRFromPython<typename C_::value_type> tmp(name);
else
throw PythonError("Can't register l-value converter for '" + name +"'.");
diff --git a/python/mask.cc b/python/mask.cc
index f42b8fa0e..2725c890b 100644
--- a/python/mask.cc
+++ b/python/mask.cc
@@ -32,39 +32,39 @@ class MaskSptrToPythonVisitor :
public ConstVisitor<MaskVisitorTypes>
{
private:
- const tr1::shared_ptr<const Mask> & _m_ptr;
+ const std::tr1::shared_ptr<const Mask> & _m_ptr;
public:
bp::object obj;
- MaskSptrToPythonVisitor(const tr1::shared_ptr<const Mask> & m_ptr) :
+ MaskSptrToPythonVisitor(const std::tr1::shared_ptr<const Mask> & m_ptr) :
_m_ptr(m_ptr)
{
}
void visit(const UserMask & m)
{
- obj = bp::object(tr1::static_pointer_cast<const UserMask>(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const UserMask>(_m_ptr));
}
void visit(const UnacceptedMask & m)
{
- obj = bp::object(tr1::static_pointer_cast<const UnacceptedMask>(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const UnacceptedMask>(_m_ptr));
}
void visit(const RepositoryMask & m)
{
- obj = bp::object(tr1::static_pointer_cast<const RepositoryMask>(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const RepositoryMask>(_m_ptr));
}
void visit(const UnsupportedMask & m)
{
- obj = bp::object(tr1::static_pointer_cast<const UnsupportedMask>(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const UnsupportedMask>(_m_ptr));
}
void visit(const AssociationMask & m)
{
- obj = bp::object(tr1::static_pointer_cast<const AssociationMask>(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const AssociationMask>(_m_ptr));
}
};
@@ -72,11 +72,11 @@ struct MaskSptrToPython
{
MaskSptrToPython()
{
- bp::to_python_converter<tr1::shared_ptr<const Mask>, MaskSptrToPython>();
+ bp::to_python_converter<std::tr1::shared_ptr<const Mask>, MaskSptrToPython>();
}
static PyObject *
- convert(const tr1::shared_ptr<const Mask> & m)
+ convert(const std::tr1::shared_ptr<const Mask> & m)
{
MaskSptrToPythonVisitor v(m);
m->accept(v);
@@ -138,7 +138,7 @@ struct UnacceptedMaskWrapper :
UnacceptedMask,
bp::wrapper<UnacceptedMask>
{
- virtual const tr1::shared_ptr<const MetadataKey> unaccepted_key() const
+ virtual const std::tr1::shared_ptr<const MetadataKey> unaccepted_key() const
{
Lock l(get_mutex());
@@ -173,7 +173,7 @@ struct RepositoryMaskWrapper :
RepositoryMask,
bp::wrapper<RepositoryMask>
{
- virtual const tr1::shared_ptr<const MetadataKey> mask_key() const
+ virtual const std::tr1::shared_ptr<const MetadataKey> mask_key() const
{
Lock l(get_mutex());
@@ -242,7 +242,7 @@ struct AssociationMaskWrapper :
AssociationMask,
bp::wrapper<AssociationMask>
{
- virtual const tr1::shared_ptr<const PackageID> associated_package() const
+ virtual const std::tr1::shared_ptr<const PackageID> associated_package() const
{
Lock l(get_mutex());
@@ -280,11 +280,11 @@ void expose_mask()
* RepositoryMaskInfo
*/
register_shared_ptrs_to_python<RepositoryMaskInfo>(rsp_const);
- bp::class_<RepositoryMaskInfo, tr1::shared_ptr<RepositoryMaskInfo> >
+ bp::class_<RepositoryMaskInfo, std::tr1::shared_ptr<RepositoryMaskInfo> >
(
"RepositoryMaskInfo",
"Information about a RepositoryMask.",
- bp::init<const FSEntry &, const tr1::shared_ptr<const Sequence<std::string> > &>(
+ bp::init<const FSEntry &, const std::tr1::shared_ptr<const Sequence<std::string> > &>(
"__init__(path_str, list of string)"
)
)
@@ -296,8 +296,8 @@ void expose_mask()
)
.add_property("comment",
- &kc_getter<RepositoryMaskInfo, tr1::shared_ptr<const Sequence<std::string> >, k::comment>,
- &kc_setter<RepositoryMaskInfo, tr1::shared_ptr<const Sequence<std::string> >, k::comment>,
+ &kc_getter<RepositoryMaskInfo, std::tr1::shared_ptr<const Sequence<std::string> >, k::comment>,
+ &kc_setter<RepositoryMaskInfo, std::tr1::shared_ptr<const Sequence<std::string> >, k::comment>,
"[ro] Iterable of str\n"
"Sequence of lines explaining the mask."
)
@@ -339,9 +339,9 @@ void expose_mask()
/**
* UserMask
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const UserMask> >();
- bp::implicitly_convertible<tr1::shared_ptr<UserMaskWrapper>, tr1::shared_ptr<Mask> >();
- bp::class_<UserMaskWrapper, tr1::shared_ptr<UserMaskWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const UserMask> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<UserMaskWrapper>, std::tr1::shared_ptr<Mask> >();
+ bp::class_<UserMaskWrapper, std::tr1::shared_ptr<UserMaskWrapper>,
bp::bases<Mask>, boost::noncopyable>
(
"UserMask",
@@ -365,9 +365,9 @@ void expose_mask()
/**
* UnacceptedMask
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const UnacceptedMask> >();
- bp::implicitly_convertible<tr1::shared_ptr<UnacceptedMaskWrapper>, tr1::shared_ptr<Mask> >();
- bp::class_<UnacceptedMaskWrapper, tr1::shared_ptr<UnacceptedMaskWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const UnacceptedMask> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<UnacceptedMaskWrapper>, std::tr1::shared_ptr<Mask> >();
+ bp::class_<UnacceptedMaskWrapper, std::tr1::shared_ptr<UnacceptedMaskWrapper>,
bp::bases<Mask>, boost::noncopyable>
(
"UnacceptedMask",
@@ -398,9 +398,9 @@ void expose_mask()
/**
* RepositoryMask
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const RepositoryMask> >();
- bp::implicitly_convertible<tr1::shared_ptr<RepositoryMaskWrapper>, tr1::shared_ptr<Mask> >();
- bp::class_<RepositoryMaskWrapper, tr1::shared_ptr<RepositoryMaskWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const RepositoryMask> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<RepositoryMaskWrapper>, std::tr1::shared_ptr<Mask> >();
+ bp::class_<RepositoryMaskWrapper, std::tr1::shared_ptr<RepositoryMaskWrapper>,
bp::bases<Mask>, boost::noncopyable>
(
"RepositoryMask",
@@ -431,9 +431,9 @@ void expose_mask()
/**
* UnsupportedMask
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const UnsupportedMask> >();
- bp::implicitly_convertible<tr1::shared_ptr<UnsupportedMaskWrapper>, tr1::shared_ptr<Mask> >();
- bp::class_<UnsupportedMaskWrapper, tr1::shared_ptr<UnsupportedMaskWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const UnsupportedMask> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<UnsupportedMaskWrapper>, std::tr1::shared_ptr<Mask> >();
+ bp::class_<UnsupportedMaskWrapper, std::tr1::shared_ptr<UnsupportedMaskWrapper>,
bp::bases<Mask>, boost::noncopyable>
(
"UnsupportedMask",
@@ -464,9 +464,9 @@ void expose_mask()
/**
* AssociationMask
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const AssociationMask> >();
- bp::implicitly_convertible<tr1::shared_ptr<AssociationMaskWrapper>, tr1::shared_ptr<Mask> >();
- bp::class_<AssociationMaskWrapper, tr1::shared_ptr<AssociationMaskWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const AssociationMask> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<AssociationMaskWrapper>, std::tr1::shared_ptr<Mask> >();
+ bp::class_<AssociationMaskWrapper, std::tr1::shared_ptr<AssociationMaskWrapper>,
bp::bases<Mask>, boost::noncopyable>
(
"AssociationMask",
diff --git a/python/metadata_key.cc b/python/metadata_key.cc
index a49ecf29e..861d3b972 100644
--- a/python/metadata_key.cc
+++ b/python/metadata_key.cc
@@ -39,119 +39,119 @@ class MetadataKeySptrToPythonVisitor :
public ConstVisitor<MetadataKeyVisitorTypes>
{
private:
- const tr1::shared_ptr<const MetadataKey> & _m_ptr;
+ const std::tr1::shared_ptr<const MetadataKey> & _m_ptr;
public:
boost::python::object obj;
- MetadataKeySptrToPythonVisitor(const tr1::shared_ptr<const MetadataKey> & m_ptr) :
+ MetadataKeySptrToPythonVisitor(const std::tr1::shared_ptr<const MetadataKey> & m_ptr) :
_m_ptr(m_ptr)
{
}
- void visit(const MetadataValueKey<tr1::shared_ptr<const PackageID> > & k)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >(_m_ptr));
}
void visit(const MetadataValueKey<std::string> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataValueKey<std::string> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataValueKey<std::string> >(_m_ptr));
}
void visit(const MetadataValueKey<long> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataValueKey<long> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataValueKey<long> >(_m_ptr));
}
void visit(const MetadataValueKey<bool> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataValueKey<bool> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataValueKey<bool> >(_m_ptr));
}
void visit(const MetadataTimeKey & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataTimeKey>(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataTimeKey>(_m_ptr));
}
- void visit(const MetadataValueKey<tr1::shared_ptr<const Contents> > & k)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const Contents> > & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataValueKey<tr1::shared_ptr<const Contents> > >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >(_m_ptr));
}
- void visit(const MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > & k)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > >(_m_ptr));
}
void visit(const MetadataValueKey<FSEntry> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataValueKey<FSEntry> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataValueKey<FSEntry> >(_m_ptr));
}
void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<KeywordNameSet> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataCollectionKey<KeywordNameSet> >(_m_ptr));
}
void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<UseFlagNameSet> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataCollectionKey<UseFlagNameSet> >(_m_ptr));
}
void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<IUseFlagSet> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataCollectionKey<IUseFlagSet> >(_m_ptr));
}
void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<Set<std::string> > >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataCollectionKey<Set<std::string> > >(_m_ptr));
}
void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<FSEntrySequence> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataCollectionKey<FSEntrySequence> >(_m_ptr));
}
void visit(const MetadataSpecTreeKey<LicenseSpecTree> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSpecTreeKey<LicenseSpecTree> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataSpecTreeKey<LicenseSpecTree> >(_m_ptr));
}
void visit(const MetadataSpecTreeKey<ProvideSpecTree> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSpecTreeKey<ProvideSpecTree> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataSpecTreeKey<ProvideSpecTree> >(_m_ptr));
}
void visit(const MetadataSpecTreeKey<DependencySpecTree> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSpecTreeKey<DependencySpecTree> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataSpecTreeKey<DependencySpecTree> >(_m_ptr));
}
void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSpecTreeKey<RestrictSpecTree> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataSpecTreeKey<RestrictSpecTree> >(_m_ptr));
}
void visit(const MetadataSpecTreeKey<FetchableURISpecTree> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSpecTreeKey<FetchableURISpecTree> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataSpecTreeKey<FetchableURISpecTree> >(_m_ptr));
}
void visit(const MetadataSpecTreeKey<SimpleURISpecTree> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSpecTreeKey<SimpleURISpecTree> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataSpecTreeKey<SimpleURISpecTree> >(_m_ptr));
}
void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<PackageIDSequence> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataCollectionKey<PackageIDSequence> >(_m_ptr));
}
void visit(const MetadataSectionKey & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSectionKey>(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataSectionKey>(_m_ptr));
}
};
@@ -159,11 +159,11 @@ struct MetadataKeySptrToPython
{
MetadataKeySptrToPython()
{
- bp::to_python_converter<tr1::shared_ptr<const MetadataKey>, MetadataKeySptrToPython>();
+ bp::to_python_converter<std::tr1::shared_ptr<const MetadataKey>, MetadataKeySptrToPython>();
}
static PyObject *
- convert(const tr1::shared_ptr<const MetadataKey> & m)
+ convert(const std::tr1::shared_ptr<const MetadataKey> & m)
{
MetadataKeySptrToPythonVisitor v(m);
m->accept(v);
@@ -172,15 +172,15 @@ struct MetadataKeySptrToPython
};
struct MetadataPackageIDKeyWrapper :
- MetadataValueKey<tr1::shared_ptr<const PackageID> > ,
- bp::wrapper<MetadataValueKey<tr1::shared_ptr<const PackageID> > >
+ MetadataValueKey<std::tr1::shared_ptr<const PackageID> > ,
+ bp::wrapper<MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
{
MetadataPackageIDKeyWrapper(const std::string & r, const std::string & h, const MetadataKeyType t) :
- MetadataValueKey<tr1::shared_ptr<const PackageID> > (r, h, t)
+ MetadataValueKey<std::tr1::shared_ptr<const PackageID> > (r, h, t)
{
}
- virtual const tr1::shared_ptr<const PackageID> value() const
+ virtual const std::tr1::shared_ptr<const PackageID> value() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -252,7 +252,7 @@ struct MetadataSectionKeyWrapper :
throw PythonMethodNotImplemented("MetadataSectionKey", "need_keys_added");
}
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > title_key() const
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > title_key() const
{
Lock l(get_mutex());
@@ -285,15 +285,15 @@ struct MetadataTimeKeyWrapper :
};
struct MetadataContentsKeyWrapper :
- MetadataValueKey<tr1::shared_ptr<const Contents> > ,
- bp::wrapper<MetadataValueKey<tr1::shared_ptr<const Contents> > >
+ MetadataValueKey<std::tr1::shared_ptr<const Contents> > ,
+ bp::wrapper<MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
{
MetadataContentsKeyWrapper(const std::string & r, const std::string & h, const MetadataKeyType t) :
- MetadataValueKey<tr1::shared_ptr<const Contents> > (r, h, t)
+ MetadataValueKey<std::tr1::shared_ptr<const Contents> > (r, h, t)
{
}
- virtual const tr1::shared_ptr<const Contents> value() const
+ virtual const std::tr1::shared_ptr<const Contents> value() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -327,15 +327,15 @@ struct MetadataFSEntryKeyWrapper :
};
struct MetadataRepositoryMaskInfoKeyWrapper :
- MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > ,
- bp::wrapper<MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > >
+ MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > ,
+ bp::wrapper<MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > >
{
MetadataRepositoryMaskInfoKeyWrapper(const std::string & r, const std::string & h, const MetadataKeyType t) :
- MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > (r, h, t)
+ MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > (r, h, t)
{
}
- virtual const tr1::shared_ptr<const RepositoryMaskInfo> value() const
+ virtual const std::tr1::shared_ptr<const RepositoryMaskInfo> value() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -357,7 +357,7 @@ struct MetadataCollectionKeyWrapper :
{
}
- virtual const tr1::shared_ptr<const C_> value() const
+ virtual const std::tr1::shared_ptr<const C_> value() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -369,7 +369,7 @@ struct MetadataCollectionKeyWrapper :
}
std::string pretty_print_flat(const Formatter<
- typename tr1::remove_const<
+ typename std::tr1::remove_const<
typename RemoveSharedPtr<typename C_::value_type>::Type>::type> & formatter) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
@@ -392,7 +392,7 @@ struct MetadataCollectionKeyWrapper<IUseFlagSet> :
{
}
- virtual const tr1::shared_ptr<const IUseFlagSet> value() const
+ virtual const std::tr1::shared_ptr<const IUseFlagSet> value() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -416,7 +416,7 @@ struct MetadataCollectionKeyWrapper<IUseFlagSet> :
std::string pretty_print_flat_with_comparison(
const Environment * const e,
- const tr1::shared_ptr<const PackageID> & pid,
+ const std::tr1::shared_ptr<const PackageID> & pid,
const Formatter<IUseFlag> & formatter) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
@@ -439,7 +439,7 @@ struct MetadataSpecTreeKeyWrapper :
{
}
- virtual const tr1::shared_ptr<const typename C_::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const typename C_::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -483,7 +483,7 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> :
{
}
- virtual const tr1::shared_ptr<const FetchableURISpecTree::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const FetchableURISpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -516,7 +516,7 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> :
throw PythonMethodNotImplemented("MetadataSpecTreeKey", "pretty_print_flat");
}
- virtual const tr1::shared_ptr<const URILabel> initial_label() const
+ virtual const std::tr1::shared_ptr<const URILabel> initial_label() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -538,7 +538,7 @@ struct MetadataSpecTreeKeyWrapper<DependencySpecTree> :
{
}
- virtual const tr1::shared_ptr<const DependencySpecTree::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const DependencySpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -571,7 +571,7 @@ struct MetadataSpecTreeKeyWrapper<DependencySpecTree> :
throw PythonMethodNotImplemented("MetadataSpecTreeKey", "pretty_print_flat");
}
- virtual const tr1::shared_ptr<const DependencyLabelSequence> initial_labels() const
+ virtual const std::tr1::shared_ptr<const DependencyLabelSequence> initial_labels() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -585,11 +585,11 @@ struct MetadataSpecTreeKeyWrapper<DependencySpecTree> :
template <typename C_>
struct class_set_key :
- bp::class_<MetadataCollectionKeyWrapper<C_>, tr1::shared_ptr<MetadataCollectionKeyWrapper<C_> >,
+ bp::class_<MetadataCollectionKeyWrapper<C_>, std::tr1::shared_ptr<MetadataCollectionKeyWrapper<C_> >,
bp::bases<MetadataKey>, boost::noncopyable>
{
class_set_key(const std::string & set) :
- bp::class_<MetadataCollectionKeyWrapper<C_>, tr1::shared_ptr<MetadataCollectionKeyWrapper<C_> >,
+ bp::class_<MetadataCollectionKeyWrapper<C_>, std::tr1::shared_ptr<MetadataCollectionKeyWrapper<C_> >,
bp::bases<MetadataKey>, boost::noncopyable>(
("Metadata" + set + "Key").c_str(),
"A MetadataCollectionKey is a MetadataKey that holds a Set or Sequence of some kind of item\n"
@@ -601,9 +601,9 @@ struct class_set_key :
)
)
{
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataCollectionKey<C_> > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataCollectionKeyWrapper<C_> >,
- tr1::shared_ptr<MetadataKey> >();
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataCollectionKey<C_> > >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataCollectionKeyWrapper<C_> >,
+ std::tr1::shared_ptr<MetadataKey> >();
def("value", bp::pure_virtual(&MetadataCollectionKey<C_>::value),
("value() -> " + set + "\n"
@@ -620,11 +620,11 @@ struct class_set_key :
template <>
struct class_set_key<IUseFlagSet> :
- bp::class_<MetadataCollectionKeyWrapper<IUseFlagSet>, tr1::shared_ptr<MetadataCollectionKeyWrapper<IUseFlagSet> >,
+ bp::class_<MetadataCollectionKeyWrapper<IUseFlagSet>, std::tr1::shared_ptr<MetadataCollectionKeyWrapper<IUseFlagSet> >,
bp::bases<MetadataKey>, boost::noncopyable>
{
class_set_key(const std::string & set) :
- bp::class_<MetadataCollectionKeyWrapper<IUseFlagSet>, tr1::shared_ptr<MetadataCollectionKeyWrapper<IUseFlagSet> >,
+ bp::class_<MetadataCollectionKeyWrapper<IUseFlagSet>, std::tr1::shared_ptr<MetadataCollectionKeyWrapper<IUseFlagSet> >,
bp::bases<MetadataKey>, boost::noncopyable>(
("Metadata" + set + "Key").c_str(),
"A MetadataCollectionKey is a MetadataKey that holds a Set or Sequence of some kind of item\n"
@@ -636,9 +636,9 @@ struct class_set_key<IUseFlagSet> :
)
)
{
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataCollectionKeyWrapper<IUseFlagSet> >,
- tr1::shared_ptr<MetadataKey> >();
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataCollectionKeyWrapper<IUseFlagSet> >,
+ std::tr1::shared_ptr<MetadataKey> >();
def("value", bp::pure_virtual(&MetadataCollectionKey<IUseFlagSet>::value),
("value() -> " + set + "\n"
@@ -664,11 +664,11 @@ struct class_set_key<IUseFlagSet> :
template <typename C_>
struct class_spec_tree_key :
- bp::class_<MetadataSpecTreeKeyWrapper<C_>, tr1::shared_ptr<MetadataSpecTreeKeyWrapper<C_> >,
+ bp::class_<MetadataSpecTreeKeyWrapper<C_>, std::tr1::shared_ptr<MetadataSpecTreeKeyWrapper<C_> >,
bp::bases<MetadataKey>, boost::noncopyable>
{
class_spec_tree_key(const std::string & spec_tree) :
- bp::class_<MetadataSpecTreeKeyWrapper<C_>, tr1::shared_ptr<MetadataSpecTreeKeyWrapper<C_> >,
+ bp::class_<MetadataSpecTreeKeyWrapper<C_>, std::tr1::shared_ptr<MetadataSpecTreeKeyWrapper<C_> >,
bp::bases<MetadataKey>, boost::noncopyable>(
("Metadata" + spec_tree + "Key").c_str(),
"A MetadataSpecTreeKey is a MetadataKey that holds a spec tree of some\n"
@@ -680,9 +680,9 @@ struct class_spec_tree_key :
)
)
{
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataSpecTreeKey<C_> > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataSpecTreeKeyWrapper<C_> >,
- tr1::shared_ptr<MetadataKey> >();
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataSpecTreeKey<C_> > >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataSpecTreeKeyWrapper<C_> >,
+ std::tr1::shared_ptr<MetadataKey> >();
def("value", bp::pure_virtual(&MetadataSpecTreeKey<C_>::value),
("value() -> " + spec_tree + "\n"
@@ -706,12 +706,12 @@ struct class_spec_tree_key :
template <>
struct class_spec_tree_key<FetchableURISpecTree> :
bp::class_<MetadataSpecTreeKeyWrapper<FetchableURISpecTree>,
- tr1::shared_ptr<MetadataSpecTreeKeyWrapper<FetchableURISpecTree> >,
+ std::tr1::shared_ptr<MetadataSpecTreeKeyWrapper<FetchableURISpecTree> >,
bp::bases<MetadataKey>, boost::noncopyable>
{
class_spec_tree_key(const std::string & spec_tree) :
bp::class_<MetadataSpecTreeKeyWrapper<FetchableURISpecTree>,
- tr1::shared_ptr<MetadataSpecTreeKeyWrapper<FetchableURISpecTree> >,
+ std::tr1::shared_ptr<MetadataSpecTreeKeyWrapper<FetchableURISpecTree> >,
bp::bases<MetadataKey>, boost::noncopyable>(
("Metadata" + spec_tree + "Key").c_str(),
"A MetadataSpecTreeKey is a MetadataKey that holds a spec tree of some\n"
@@ -723,9 +723,9 @@ struct class_spec_tree_key<FetchableURISpecTree> :
)
)
{
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataSpecTreeKeyWrapper<FetchableURISpecTree> >,
- tr1::shared_ptr<MetadataKey> >();
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataSpecTreeKeyWrapper<FetchableURISpecTree> >,
+ std::tr1::shared_ptr<MetadataKey> >();
def("value", bp::pure_virtual(&MetadataSpecTreeKey<FetchableURISpecTree>::value),
("value() -> " + spec_tree + "\n"
@@ -755,12 +755,12 @@ struct class_spec_tree_key<FetchableURISpecTree> :
template <>
struct class_spec_tree_key<DependencySpecTree> :
bp::class_<MetadataSpecTreeKeyWrapper<DependencySpecTree>,
- tr1::shared_ptr<MetadataSpecTreeKeyWrapper<DependencySpecTree> >,
+ std::tr1::shared_ptr<MetadataSpecTreeKeyWrapper<DependencySpecTree> >,
bp::bases<MetadataKey>, boost::noncopyable>
{
class_spec_tree_key(const std::string & spec_tree) :
bp::class_<MetadataSpecTreeKeyWrapper<DependencySpecTree>,
- tr1::shared_ptr<MetadataSpecTreeKeyWrapper<DependencySpecTree> >,
+ std::tr1::shared_ptr<MetadataSpecTreeKeyWrapper<DependencySpecTree> >,
bp::bases<MetadataKey>, boost::noncopyable>(
("Metadata" + spec_tree + "Key").c_str(),
"A MetadataSpecTreeKey is a MetadataKey that holds a spec tree of some\n"
@@ -772,9 +772,9 @@ struct class_spec_tree_key<DependencySpecTree> :
)
)
{
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataSpecTreeKeyWrapper<DependencySpecTree> >,
- tr1::shared_ptr<MetadataKey> >();
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataSpecTreeKeyWrapper<DependencySpecTree> >,
+ std::tr1::shared_ptr<MetadataKey> >();
def("value", bp::pure_virtual(&MetadataSpecTreeKey<DependencySpecTree>::value),
("value() -> " + spec_tree + "\n"
@@ -857,10 +857,10 @@ void expose_metadata_key()
/**
* MetadataPackageIDKey
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataPackageIDKeyWrapper>,
- tr1::shared_ptr<MetadataKey> >();
- bp::class_<MetadataPackageIDKeyWrapper, tr1::shared_ptr<MetadataPackageIDKeyWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataPackageIDKeyWrapper>,
+ std::tr1::shared_ptr<MetadataKey> >();
+ bp::class_<MetadataPackageIDKeyWrapper, std::tr1::shared_ptr<MetadataPackageIDKeyWrapper>,
bp::bases<MetadataKey>, boost::noncopyable>
(
"MetadataPackageIDKey",
@@ -872,7 +872,7 @@ void expose_metadata_key()
"__init__(raw_name, human_name, MetadataKeyType)"
)
)
- .def("value", bp::pure_virtual(&MetadataValueKey<tr1::shared_ptr<const PackageID> > ::value),
+ .def("value", bp::pure_virtual(&MetadataValueKey<std::tr1::shared_ptr<const PackageID> > ::value),
"value() -> PackageID\n"
"Fetch our value."
)
@@ -881,10 +881,10 @@ void expose_metadata_key()
/**
* MetadataStringKey
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataValueKey<std::string> > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataStringKeyWrapper>,
- tr1::shared_ptr<MetadataKey> >();
- bp::class_<MetadataStringKeyWrapper, tr1::shared_ptr<MetadataStringKeyWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataValueKey<std::string> > >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataStringKeyWrapper>,
+ std::tr1::shared_ptr<MetadataKey> >();
+ bp::class_<MetadataStringKeyWrapper, std::tr1::shared_ptr<MetadataStringKeyWrapper>,
bp::bases<MetadataKey>, boost::noncopyable>
(
"MetadataStringKey",
@@ -905,10 +905,10 @@ void expose_metadata_key()
/**
* MetadataSectionKey
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataSectionKey> >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataSectionKeyWrapper>,
- tr1::shared_ptr<MetadataKey> >();
- bp::class_<MetadataSectionKeyWrapper, tr1::shared_ptr<MetadataSectionKeyWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataSectionKey> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataSectionKeyWrapper>,
+ std::tr1::shared_ptr<MetadataKey> >();
+ bp::class_<MetadataSectionKeyWrapper, std::tr1::shared_ptr<MetadataSectionKeyWrapper>,
bp::bases<MetadataKey>, boost::noncopyable>
(
"MetadataSectionKey",
@@ -934,10 +934,10 @@ void expose_metadata_key()
/**
* MetadataTimeKey
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataTimeKey> >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataTimeKeyWrapper>,
- tr1::shared_ptr<MetadataKey> >();
- bp::class_<MetadataTimeKeyWrapper, tr1::shared_ptr<MetadataTimeKeyWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataTimeKey> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataTimeKeyWrapper>,
+ std::tr1::shared_ptr<MetadataKey> >();
+ bp::class_<MetadataTimeKeyWrapper, std::tr1::shared_ptr<MetadataTimeKeyWrapper>,
bp::bases<MetadataKey>, boost::noncopyable>
(
"MetadataTimeKey",
@@ -957,10 +957,10 @@ void expose_metadata_key()
/**
* MetadataFSEntryKey
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataValueKey<FSEntry> > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataFSEntryKeyWrapper>,
- tr1::shared_ptr<MetadataKey> >();
- bp::class_<MetadataFSEntryKeyWrapper, tr1::shared_ptr<MetadataFSEntryKeyWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataFSEntryKeyWrapper>,
+ std::tr1::shared_ptr<MetadataKey> >();
+ bp::class_<MetadataFSEntryKeyWrapper, std::tr1::shared_ptr<MetadataFSEntryKeyWrapper>,
bp::bases<MetadataKey>, boost::noncopyable>
(
"MetadataFSEntryKey",
@@ -980,10 +980,10 @@ void expose_metadata_key()
/**
* MetadataContentsKey
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const Contents> > > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataContentsKeyWrapper>,
- tr1::shared_ptr<MetadataKey> >();
- bp::class_<MetadataContentsKeyWrapper, tr1::shared_ptr<MetadataContentsKeyWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > > >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataContentsKeyWrapper>,
+ std::tr1::shared_ptr<MetadataKey> >();
+ bp::class_<MetadataContentsKeyWrapper, std::tr1::shared_ptr<MetadataContentsKeyWrapper>,
bp::bases<MetadataKey>, boost::noncopyable>
(
"MetadataContentsKey",
@@ -994,7 +994,7 @@ void expose_metadata_key()
"__init__(raw_name, human_name, MetadataKeyType)"
)
)
- .def("value", bp::pure_virtual(&MetadataValueKey<tr1::shared_ptr<const Contents> > ::value),
+ .def("value", bp::pure_virtual(&MetadataValueKey<std::tr1::shared_ptr<const Contents> > ::value),
"value() -> Contents\n"
"Fetch our value."
)
@@ -1021,10 +1021,10 @@ void expose_metadata_key()
/**
* MetadataRepositoryMaskInfoKey
*/
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataRepositoryMaskInfoKeyWrapper>,
- tr1::shared_ptr<MetadataKey> >();
- bp::class_<MetadataRepositoryMaskInfoKeyWrapper, tr1::shared_ptr<MetadataRepositoryMaskInfoKeyWrapper>,
+ bp::register_ptr_to_python<std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > > >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<MetadataRepositoryMaskInfoKeyWrapper>,
+ std::tr1::shared_ptr<MetadataKey> >();
+ bp::class_<MetadataRepositoryMaskInfoKeyWrapper, std::tr1::shared_ptr<MetadataRepositoryMaskInfoKeyWrapper>,
bp::bases<MetadataKey>, boost::noncopyable>
(
"MetadataRepositoryMaskInfoKey",
@@ -1036,7 +1036,7 @@ void expose_metadata_key()
"__init__(raw_name, human_name, MetadataKeyType)"
)
)
- .def("value", bp::pure_virtual(&MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > ::value),
+ .def("value", bp::pure_virtual(&MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > ::value),
"value() -> RepositoryMaskInfo\n"
"Fetch our value."
)
diff --git a/python/package_database.cc b/python/package_database.cc
index 08cb59ae2..8eb869f52 100644
--- a/python/package_database.cc
+++ b/python/package_database.cc
@@ -69,7 +69,7 @@ void expose_package_database()
* PackageDatabase
*/
register_shared_ptrs_to_python<PackageDatabase>();
- tr1::shared_ptr<Repository>
+ std::tr1::shared_ptr<Repository>
(PackageDatabase::* fetch_repository_ptr)(const RepositoryName &) = &PackageDatabase::fetch_repository;
bp::class_<PackageDatabase, boost::noncopyable>
(
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
diff --git a/python/query.cc b/python/query.cc
index f8f4c9e33..6afc04a0d 100644
--- a/python/query.cc
+++ b/python/query.cc
@@ -43,29 +43,29 @@ class PythonQuery :
{
}
- virtual tr1::shared_ptr<RepositoryNameSequence> repositories(const Environment &) const
+ virtual std::tr1::shared_ptr<RepositoryNameSequence> repositories(const Environment &) const
{
- return tr1::shared_ptr<RepositoryNameSequence>();
+ return std::tr1::shared_ptr<RepositoryNameSequence>();
}
- virtual tr1::shared_ptr<CategoryNamePartSet> categories(const Environment &,
- tr1::shared_ptr<const RepositoryNameSequence>) const
+ virtual std::tr1::shared_ptr<CategoryNamePartSet> categories(const Environment &,
+ std::tr1::shared_ptr<const RepositoryNameSequence>) const
{
- return tr1::shared_ptr<CategoryNamePartSet>();
+ return std::tr1::shared_ptr<CategoryNamePartSet>();
}
- virtual tr1::shared_ptr<QualifiedPackageNameSet> packages(const Environment &,
- tr1::shared_ptr<const RepositoryNameSequence>,
- tr1::shared_ptr<const CategoryNamePartSet>) const
+ virtual std::tr1::shared_ptr<QualifiedPackageNameSet> packages(const Environment &,
+ std::tr1::shared_ptr<const RepositoryNameSequence>,
+ std::tr1::shared_ptr<const CategoryNamePartSet>) const
{
- return tr1::shared_ptr<QualifiedPackageNameSet>();
+ return std::tr1::shared_ptr<QualifiedPackageNameSet>();
}
- virtual tr1::shared_ptr<PackageIDSequence> ids(const Environment &,
- tr1::shared_ptr<const RepositoryNameSequence>,
- tr1::shared_ptr<const QualifiedPackageNameSet>) const
+ virtual std::tr1::shared_ptr<PackageIDSequence> ids(const Environment &,
+ std::tr1::shared_ptr<const RepositoryNameSequence>,
+ std::tr1::shared_ptr<const QualifiedPackageNameSet>) const
{
- return tr1::shared_ptr<PackageIDSequence>();
+ return std::tr1::shared_ptr<PackageIDSequence>();
}
virtual std::string as_human_readable_string() const = 0;
@@ -83,27 +83,27 @@ class PythonQueryDelegate :
{
}
- tr1::shared_ptr<RepositoryNameSequence> repositories(const Environment & e) const
+ std::tr1::shared_ptr<RepositoryNameSequence> repositories(const Environment & e) const
{
return _q->repositories(e);
}
- tr1::shared_ptr<CategoryNamePartSet> categories(const Environment & e,
- tr1::shared_ptr<const RepositoryNameSequence> r) const
+ std::tr1::shared_ptr<CategoryNamePartSet> categories(const Environment & e,
+ std::tr1::shared_ptr<const RepositoryNameSequence> r) const
{
return _q->categories(e, r);
}
- tr1::shared_ptr<QualifiedPackageNameSet> packages(const Environment & e,
- tr1::shared_ptr<const RepositoryNameSequence> r,
- tr1::shared_ptr<const CategoryNamePartSet> c) const
+ std::tr1::shared_ptr<QualifiedPackageNameSet> packages(const Environment & e,
+ std::tr1::shared_ptr<const RepositoryNameSequence> r,
+ std::tr1::shared_ptr<const CategoryNamePartSet> c) const
{
return _q->packages(e, r, c);
}
- tr1::shared_ptr<PackageIDSequence> ids(const Environment & e,
- tr1::shared_ptr<const RepositoryNameSequence> r,
- tr1::shared_ptr<const QualifiedPackageNameSet> q) const
+ std::tr1::shared_ptr<PackageIDSequence> ids(const Environment & e,
+ std::tr1::shared_ptr<const RepositoryNameSequence> r,
+ std::tr1::shared_ptr<const QualifiedPackageNameSet> q) const
{
return _q->ids(e, r, q);
}
@@ -115,7 +115,7 @@ class PythonQueryDelegate :
};
PythonQuery::PythonQuery() :
- Query(tr1::shared_ptr<const PythonQueryDelegate>(new PythonQueryDelegate(this)))
+ Query(std::tr1::shared_ptr<const PythonQueryDelegate>(new PythonQueryDelegate(this)))
{
}
@@ -123,7 +123,7 @@ struct PythonQueryWrapper :
PythonQuery,
bp::wrapper<PythonQuery>
{
- tr1::shared_ptr<RepositoryNameSequence> repositories(const Environment & e) const
+ std::tr1::shared_ptr<RepositoryNameSequence> repositories(const Environment & e) const
{
Lock l(get_mutex());
@@ -132,13 +132,13 @@ struct PythonQueryWrapper :
return PythonQuery::repositories(e);
}
- tr1::shared_ptr<RepositoryNameSequence> default_repositories(const Environment & e) const
+ std::tr1::shared_ptr<RepositoryNameSequence> default_repositories(const Environment & e) const
{
return PythonQuery::repositories(e);
}
- tr1::shared_ptr<CategoryNamePartSet> categories(const Environment & e,
- tr1::shared_ptr<const RepositoryNameSequence> r) const
+ std::tr1::shared_ptr<CategoryNamePartSet> categories(const Environment & e,
+ std::tr1::shared_ptr<const RepositoryNameSequence> r) const
{
Lock l(get_mutex());
@@ -147,15 +147,15 @@ struct PythonQueryWrapper :
return PythonQuery::categories(e, r);
}
- tr1::shared_ptr<CategoryNamePartSet> default_categories(const Environment & e,
- tr1::shared_ptr<const RepositoryNameSequence> r) const
+ std::tr1::shared_ptr<CategoryNamePartSet> default_categories(const Environment & e,
+ std::tr1::shared_ptr<const RepositoryNameSequence> r) const
{
return PythonQuery::categories(e, r);
}
- tr1::shared_ptr<QualifiedPackageNameSet> packages(const Environment & e,
- tr1::shared_ptr<const RepositoryNameSequence> r,
- tr1::shared_ptr<const CategoryNamePartSet> c) const
+ std::tr1::shared_ptr<QualifiedPackageNameSet> packages(const Environment & e,
+ std::tr1::shared_ptr<const RepositoryNameSequence> r,
+ std::tr1::shared_ptr<const CategoryNamePartSet> c) const
{
Lock l(get_mutex());
@@ -164,16 +164,16 @@ struct PythonQueryWrapper :
return PythonQuery::packages(e, r, c);
}
- tr1::shared_ptr<QualifiedPackageNameSet> default_packages(const Environment & e,
- tr1::shared_ptr<const RepositoryNameSequence> r,
- tr1::shared_ptr<const CategoryNamePartSet> c) const
+ std::tr1::shared_ptr<QualifiedPackageNameSet> default_packages(const Environment & e,
+ std::tr1::shared_ptr<const RepositoryNameSequence> r,
+ std::tr1::shared_ptr<const CategoryNamePartSet> c) const
{
return PythonQuery::packages(e, r, c);
}
- tr1::shared_ptr<PackageIDSequence> ids(const Environment & e,
- tr1::shared_ptr<const RepositoryNameSequence> r,
- tr1::shared_ptr<const QualifiedPackageNameSet> q) const
+ std::tr1::shared_ptr<PackageIDSequence> ids(const Environment & e,
+ std::tr1::shared_ptr<const RepositoryNameSequence> r,
+ std::tr1::shared_ptr<const QualifiedPackageNameSet> q) const
{
Lock l(get_mutex());
@@ -182,9 +182,9 @@ struct PythonQueryWrapper :
return PythonQuery::ids(e, r, q);
}
- tr1::shared_ptr<PackageIDSequence> default_ids(const Environment & e,
- tr1::shared_ptr<const RepositoryNameSequence> r,
- tr1::shared_ptr<const QualifiedPackageNameSet> q) const
+ std::tr1::shared_ptr<PackageIDSequence> default_ids(const Environment & e,
+ std::tr1::shared_ptr<const RepositoryNameSequence> r,
+ std::tr1::shared_ptr<const QualifiedPackageNameSet> q) const
{
return PythonQuery::ids(e, r, q);
}
diff --git a/python/repository.cc b/python/repository.cc
index 90ce6c9d8..fcc6a6fb3 100644
--- a/python/repository.cc
+++ b/python/repository.cc
@@ -102,7 +102,7 @@ struct RepositoryWrapper :
struct FakeRepositoryWrapper
{
- static tr1::shared_ptr<PackageID>
+ static std::tr1::shared_ptr<PackageID>
add_version(FakeRepository & self, const QualifiedPackageName & qpn, const VersionSpec & vs)
{
return self.add_version(qpn, vs);
@@ -161,7 +161,7 @@ void expose_repository()
* Repository
*/
register_shared_ptrs_to_python<Repository>(rsp_const);
- bp::class_<RepositoryWrapper, tr1::shared_ptr<Repository>, boost::noncopyable>
+ bp::class_<RepositoryWrapper, std::tr1::shared_ptr<Repository>, boost::noncopyable>
(
"Repository",
"A Repository provides a representation of a physical repository to a PackageDatabase.",
@@ -431,9 +431,9 @@ void expose_repository()
/**
* FakeRepository
*/
- bp::implicitly_convertible<tr1::shared_ptr<FakeRepository>, tr1::shared_ptr<Repository> >();
+ bp::implicitly_convertible<std::tr1::shared_ptr<FakeRepository>, std::tr1::shared_ptr<Repository> >();
- bp::class_<FakeRepository, tr1::shared_ptr<FakeRepository>, bp::bases<Repository>, boost::noncopyable>
+ bp::class_<FakeRepository, std::tr1::shared_ptr<FakeRepository>, bp::bases<Repository>, boost::noncopyable>
(
"FakeRepository",
"Fake repository for use in test cases.",