aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/virtuals
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 10:11:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 18:54:57 +0100
commit7a8a792ae878e2b432e0c67a813022117faa4e60 (patch)
treed9eac8e45ccc206bc6920d14e25f5613b54be02f /paludis/repositories/virtuals
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'paludis/repositories/virtuals')
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc64
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh34
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc2
-rw-r--r--paludis/repositories/virtuals/package_id.cc124
-rw-r--r--paludis/repositories/virtuals/package_id.hh58
-rw-r--r--paludis/repositories/virtuals/registration.cc6
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc104
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh38
-rw-r--r--paludis/repositories/virtuals/virtuals_repository_TEST.cc26
9 files changed, 228 insertions, 228 deletions
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index b045bfc4e..981517f41 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -37,14 +37,14 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
-#include <tr1/functional>
-#include <tr1/unordered_map>
+#include <functional>
+#include <unordered_map>
#include <algorithm>
#include <vector>
using namespace paludis;
-typedef std::tr1::unordered_map<QualifiedPackageName, std::tr1::shared_ptr<PackageIDSequence>, Hash<QualifiedPackageName> > IDMap;
+typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequence>, Hash<QualifiedPackageName> > IDMap;
namespace paludis
{
@@ -54,14 +54,14 @@ namespace paludis
const Environment * const env;
const FSEntry root;
- const std::tr1::shared_ptr<Mutex> ids_mutex;
+ const std::shared_ptr<Mutex> ids_mutex;
mutable IDMap ids;
mutable bool has_ids;
- std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
- std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const Environment * const e, const FSEntry & r, std::tr1::shared_ptr<Mutex> m = make_shared_ptr(new Mutex)) :
+ Implementation(const Environment * const e, const FSEntry & r, std::shared_ptr<Mutex> m = make_shared_ptr(new Mutex)) :
env(e),
root(r),
ids_mutex(m),
@@ -146,7 +146,7 @@ InstalledVirtualsRepository::need_ids() const
if (! (**r).provides_interface())
continue;
- std::tr1::shared_ptr<const RepositoryProvidesInterface::ProvidesSequence> pp(
+ std::shared_ptr<const RepositoryProvidesInterface::ProvidesSequence> pp(
(**r).provides_interface()->provided_packages());
for (RepositoryProvidesInterface::ProvidesSequence::ConstIterator p(
@@ -156,7 +156,7 @@ InstalledVirtualsRepository::need_ids() const
if (i == _imp->ids.end())
i = _imp->ids.insert(std::make_pair((*p).virtual_name(), make_shared_ptr(new PackageIDSequence))).first;
- std::tr1::shared_ptr<const PackageID> id(new virtuals::VirtualsPackageID(
+ std::shared_ptr<const PackageID> id(new virtuals::VirtualsPackageID(
_imp->env, shared_from_this(), (*p).virtual_name(), (*p).provided_by(), false));
i->second->push_back(id);
}
@@ -165,40 +165,40 @@ InstalledVirtualsRepository::need_ids() const
_imp->has_ids = true;
}
-std::tr1::shared_ptr<const PackageIDSequence>
+std::shared_ptr<const PackageIDSequence>
InstalledVirtualsRepository::package_ids(const QualifiedPackageName & q) const
{
if (q.category().value() != "virtual")
- return std::tr1::shared_ptr<PackageIDSequence>(new PackageIDSequence);
+ return std::shared_ptr<PackageIDSequence>(new PackageIDSequence);
need_ids();
IDMap::const_iterator i(_imp->ids.find(q));
if (i == _imp->ids.end())
- return std::tr1::shared_ptr<PackageIDSequence>(new PackageIDSequence);
+ return std::shared_ptr<PackageIDSequence>(new PackageIDSequence);
return i->second;
}
-std::tr1::shared_ptr<const QualifiedPackageNameSet>
+std::shared_ptr<const QualifiedPackageNameSet>
InstalledVirtualsRepository::package_names(const CategoryNamePart & c) const
{
if (c.value() != "virtual")
- return std::tr1::shared_ptr<QualifiedPackageNameSet>(new QualifiedPackageNameSet);
+ return std::shared_ptr<QualifiedPackageNameSet>(new QualifiedPackageNameSet);
need_ids();
- std::tr1::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
+ std::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
std::transform(_imp->ids.begin(), _imp->ids.end(), result->inserter(),
- std::tr1::mem_fn(&std::pair<const QualifiedPackageName, std::tr1::shared_ptr<PackageIDSequence> >::first));
+ std::mem_fn(&std::pair<const QualifiedPackageName, std::shared_ptr<PackageIDSequence> >::first));
return result;
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
InstalledVirtualsRepository::category_names() const
{
- std::tr1::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
+ std::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
result->insert(CategoryNamePart("virtual"));
return result;
}
@@ -306,27 +306,27 @@ InstalledVirtualsRepository::some_ids_might_not_be_masked() const
return true;
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
InstalledVirtualsRepository::unimportant_category_names() const
{
- std::tr1::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
+ std::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
result->insert(CategoryNamePart("virtual"));
return result;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
InstalledVirtualsRepository::format_key() const
{
return _imp->format_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
InstalledVirtualsRepository::location_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::shared_ptr<const MetadataValueKey<FSEntry> >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
InstalledVirtualsRepository::installed_root_key() const
{
return _imp->root_key;
@@ -340,15 +340,15 @@ InstalledVirtualsRepository::need_keys_added() const
RepositoryName
InstalledVirtualsRepository::repository_factory_name(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
return make_name(FSEntry(f("root")));
}
-std::tr1::shared_ptr<Repository>
+std::shared_ptr<Repository>
InstalledVirtualsRepository::repository_factory_create(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
if (f("root").empty())
throw ConfigurationError("Key 'root' unspecified or empty");
@@ -356,10 +356,10 @@ InstalledVirtualsRepository::repository_factory_create(
return make_shared_ptr(new InstalledVirtualsRepository(env, f("root")));
}
-std::tr1::shared_ptr<const RepositoryNameSet>
+std::shared_ptr<const RepositoryNameSet>
InstalledVirtualsRepository::repository_factory_dependencies(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> &)
+ const std::function<std::string (const std::string &)> &)
{
return make_shared_ptr(new RepositoryNameSet);
}
@@ -396,18 +396,18 @@ InstalledVirtualsRepository::populate_sets() const
}
bool
-InstalledVirtualsRepository::sync(const std::tr1::shared_ptr<OutputManager> &) const
+InstalledVirtualsRepository::sync(const std::shared_ptr<OutputManager> &) const
{
return false;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
InstalledVirtualsRepository::accept_keywords_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
InstalledVirtualsRepository::sync_host_key() const
{
return make_null_shared_ptr();
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index 9deae5f05..d14386a69 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -23,7 +23,7 @@
#include <paludis/repository.hh>
#include <paludis/util/map-fwd.hh>
#include <paludis/util/sequence-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -35,7 +35,7 @@ namespace paludis
class PALUDIS_VISIBLE InstalledVirtualsRepository :
public Repository,
public RepositoryDestinationInterface,
- public std::tr1::enable_shared_from_this<InstalledVirtualsRepository>,
+ public std::enable_shared_from_this<InstalledVirtualsRepository>,
private PrivateImplementationPattern<InstalledVirtualsRepository>
{
private:
@@ -62,19 +62,19 @@ namespace paludis
static RepositoryName repository_factory_name(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<Repository> repository_factory_create(
+ static std::shared_ptr<Repository> repository_factory_create(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
+ static std::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
///\}
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
+ virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
virtual void invalidate();
@@ -89,15 +89,15 @@ namespace paludis
/* Repository */
- virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool has_package_named(const QualifiedPackageName &) const
@@ -110,15 +110,15 @@ namespace paludis
virtual bool some_ids_might_not_be_masked() const;
- virtual bool sync(const std::tr1::shared_ptr<OutputManager> &) const;
+ virtual bool sync(const std::shared_ptr<OutputManager> &) const;
/* Keys */
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
/* RepositoryDestinationInterface */
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc b/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc
index 4189747db..497819f4c 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc
@@ -34,7 +34,7 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<const InstalledVirtualsRepository> r(new InstalledVirtualsRepository(&env, FSEntry("/")));
+ std::shared_ptr<const InstalledVirtualsRepository> r(new InstalledVirtualsRepository(&env, FSEntry("/")));
}
} test_installed_virtuals_repository;
}
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index db0cc71a9..90a1b12c6 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -53,15 +53,15 @@ namespace paludis
struct Implementation<VirtualsDepKey>
{
const Environment * const env;
- const std::tr1::shared_ptr<DependencySpecTree> value;
- const std::tr1::shared_ptr<const DependenciesLabelSequence> labels;
- const std::tr1::shared_ptr<const PackageDepSpec> spec;
+ const std::shared_ptr<DependencySpecTree> value;
+ const std::shared_ptr<const DependenciesLabelSequence> labels;
+ const std::shared_ptr<const PackageDepSpec> spec;
const std::string raw_name;
const std::string human_name;
- Implementation(const Environment * const e, const std::tr1::shared_ptr<const PackageID> & v,
- const std::tr1::shared_ptr<const DependenciesLabelSequence> & l,
+ Implementation(const Environment * const e, const std::shared_ptr<const PackageID> & v,
+ const std::shared_ptr<const DependenciesLabelSequence> & l,
bool exact, const std::string & h, const std::string & r) :
env(e),
value(new DependencySpecTree(make_shared_ptr(new AllDepSpec))),
@@ -91,8 +91,8 @@ namespace paludis
}
VirtualsDepKey::VirtualsDepKey(const Environment * const e, const std::string & r, const std::string & h,
- const std::tr1::shared_ptr<const PackageID> & v,
- const std::tr1::shared_ptr<const DependenciesLabelSequence> & l,
+ const std::shared_ptr<const PackageID> & v,
+ const std::shared_ptr<const DependenciesLabelSequence> & l,
const bool exact) :
PrivateImplementationPattern<VirtualsDepKey>(new Implementation<VirtualsDepKey>(e, v, l, exact, r, h)),
_imp(PrivateImplementationPattern<VirtualsDepKey>::_imp)
@@ -103,7 +103,7 @@ VirtualsDepKey::~VirtualsDepKey()
{
}
-const std::tr1::shared_ptr<const DependencySpecTree>
+const std::shared_ptr<const DependencySpecTree>
VirtualsDepKey::value() const
{
return _imp->value;
@@ -151,7 +151,7 @@ VirtualsDepKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) c
return pretty_print(f);
}
-const std::tr1::shared_ptr<const DependenciesLabelSequence>
+const std::shared_ptr<const DependenciesLabelSequence>
VirtualsDepKey::initial_labels() const
{
return _imp->labels;
@@ -163,22 +163,22 @@ namespace paludis
struct Implementation<VirtualsPackageID>
{
const Environment * const env;
- const std::tr1::shared_ptr<const Repository> repository;
+ const std::shared_ptr<const Repository> repository;
const QualifiedPackageName name;
const VersionSpec version;
- std::tr1::shared_ptr<DependenciesLabelSequence> bdep_labels;
- std::tr1::shared_ptr<DependenciesLabelSequence> rdep_labels;
- const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > virtual_for;
- const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > bdep;
- const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > rdep;
+ std::shared_ptr<DependenciesLabelSequence> bdep_labels;
+ std::shared_ptr<DependenciesLabelSequence> rdep_labels;
+ const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for;
+ const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > bdep;
+ const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > rdep;
mutable bool has_masks;
mutable Mutex mutex;
Implementation(
const Environment * const e,
- const std::tr1::shared_ptr<const Repository> & o,
+ const std::shared_ptr<const Repository> & o,
const QualifiedPackageName & n,
- const std::tr1::shared_ptr<const PackageID> & p,
+ const std::shared_ptr<const PackageID> & p,
const bool b) :
env(e),
repository(o),
@@ -186,7 +186,7 @@ namespace paludis
version(p->version()),
bdep_labels(new DependenciesLabelSequence),
rdep_labels(new DependenciesLabelSequence),
- virtual_for(new LiteralMetadataValueKey<std::tr1::shared_ptr<const PackageID> > ("VIRTUAL_FOR", "Virtual for", mkt_normal, p)),
+ virtual_for(new LiteralMetadataValueKey<std::shared_ptr<const PackageID> > ("VIRTUAL_FOR", "Virtual for", mkt_normal, p)),
bdep(new virtuals::VirtualsDepKey(e, "DEPEND", "Build dependencies", p, bdep_labels, b)),
rdep(new virtuals::VirtualsDepKey(e, "RDEPEND", "Run dependencies", p, rdep_labels, b)),
has_masks(false)
@@ -201,9 +201,9 @@ namespace paludis
VirtualsPackageID::VirtualsPackageID(
const Environment * const e,
- const std::tr1::shared_ptr<const Repository> & owner,
+ const std::shared_ptr<const Repository> & owner,
const QualifiedPackageName & virtual_name,
- const std::tr1::shared_ptr<const PackageID> & virtual_for,
+ const std::shared_ptr<const PackageID> & virtual_for,
const bool exact) :
PrivateImplementationPattern<VirtualsPackageID>(
new Implementation<VirtualsPackageID>(e, owner, virtual_name, virtual_for, exact)),
@@ -268,100 +268,100 @@ VirtualsPackageID::version() const
return _imp->version;
}
-const std::tr1::shared_ptr<const Repository>
+const std::shared_ptr<const Repository>
VirtualsPackageID::repository() const
{
return _imp->repository;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
VirtualsPackageID::virtual_for_key() const
{
return _imp->virtual_for;
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
+const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
VirtualsPackageID::keywords_key() const
{
- return std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
+ return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
VirtualsPackageID::provide_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
VirtualsPackageID::dependencies_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
VirtualsPackageID::build_dependencies_key() const
{
return _imp->bdep;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
VirtualsPackageID::run_dependencies_key() const
{
return _imp->rdep;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
VirtualsPackageID::post_dependencies_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
VirtualsPackageID::suggested_dependencies_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
VirtualsPackageID::short_description_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
+ return std::shared_ptr<const MetadataValueKey<std::string> >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
VirtualsPackageID::long_description_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
+ return std::shared_ptr<const MetadataValueKey<std::string> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
VirtualsPackageID::fetches_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
VirtualsPackageID::homepage_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > >
VirtualsPackageID::contents_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >();
+ return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > >();
}
-const std::tr1::shared_ptr<const MetadataTimeKey>
+const std::shared_ptr<const MetadataTimeKey>
VirtualsPackageID::installed_time_key() const
{
- return std::tr1::shared_ptr<const MetadataTimeKey>();
+ return std::shared_ptr<const MetadataTimeKey>();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
VirtualsPackageID::from_repositories_key() const
{
- return std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >();
+ return std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >();
}
bool
@@ -464,10 +464,10 @@ namespace
public AssociationMask
{
private:
- const std::tr1::shared_ptr<const PackageID> _id;
+ const std::shared_ptr<const PackageID> _id;
public:
- VirtualsAssociationMask(const std::tr1::shared_ptr<const PackageID> & i) :
+ VirtualsAssociationMask(const std::shared_ptr<const PackageID> & i) :
_id(i)
{
}
@@ -482,7 +482,7 @@ namespace
return "by association";
}
- const std::tr1::shared_ptr<const PackageID> associated_package() const
+ const std::shared_ptr<const PackageID> associated_package() const
{
return _id;
}
@@ -515,45 +515,45 @@ VirtualsPackageID::invalidate_masks() const
PackageID::invalidate_masks();
}
-std::tr1::shared_ptr<const Set<std::string> >
+std::shared_ptr<const Set<std::string> >
VirtualsPackageID::breaks_portage() const
{
- return std::tr1::shared_ptr<const Set<std::string> >();
+ return std::shared_ptr<const Set<std::string> >();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
+const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
VirtualsPackageID::contains_key() const
{
- return std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
+ return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
VirtualsPackageID::contained_in_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
+ return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
VirtualsPackageID::fs_location_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::shared_ptr<const MetadataValueKey<FSEntry> >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<SlotName> >
+const std::shared_ptr<const MetadataValueKey<SlotName> >
VirtualsPackageID::slot_key() const
{
return _imp->virtual_for->value()->slot_key();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
VirtualsPackageID::behaviours_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > >
VirtualsPackageID::choices_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > >();
+ return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > >();
}
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index de3c99b92..5bf39c7e0 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -37,12 +37,12 @@ namespace paludis
public:
VirtualsDepKey(const Environment * const, const std::string &, const std::string &,
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const DependenciesLabelSequence> &,
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const DependenciesLabelSequence> &,
const bool);
~VirtualsDepKey();
- virtual const std::tr1::shared_ptr<const DependencySpecTree> value() const
+ virtual const std::shared_ptr<const DependencySpecTree> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const DependencySpecTree::ItemFormatter &) const
@@ -51,7 +51,7 @@ namespace paludis
virtual std::string pretty_print_flat(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<const DependenciesLabelSequence> initial_labels() const
+ virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -73,9 +73,9 @@ namespace paludis
public:
VirtualsPackageID(
const Environment * const,
- const std::tr1::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const Repository> & repo,
const QualifiedPackageName & virtual_name,
- const std::tr1::shared_ptr<const PackageID> & virtual_for,
+ const std::shared_ptr<const PackageID> & virtual_for,
const bool exact);
virtual ~VirtualsPackageID();
@@ -84,30 +84,30 @@ namespace paludis
virtual const QualifiedPackageName name() const;
virtual const VersionSpec version() const;
- virtual const std::tr1::shared_ptr<const Repository> repository() const;
+ virtual const std::shared_ptr<const Repository> repository() const;
virtual PackageDepSpec uniquely_identifying_spec() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > virtual_for_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > > contents_key() const;
- virtual const std::tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > contained_in_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > > choices_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > > contents_key() const;
+ virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const;
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void perform_action(Action &) const;
@@ -118,7 +118,7 @@ namespace paludis
virtual std::size_t extra_hash_value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void invalidate_masks() const;
};
diff --git a/paludis/repositories/virtuals/registration.cc b/paludis/repositories/virtuals/registration.cc
index cbae6521e..ad2feaebd 100644
--- a/paludis/repositories/virtuals/registration.cc
+++ b/paludis/repositories/virtuals/registration.cc
@@ -28,7 +28,7 @@ using namespace paludis;
namespace
{
- int virtual_importance(const Environment * const, const std::tr1::function<std::string (const std::string &)> & f)
+ int virtual_importance(const Environment * const, const std::function<std::string (const std::string &)> & f)
{
if (! f("importance").empty())
return destringify<int>(f("importance"));
@@ -48,7 +48,7 @@ namespace paludis
void register_repositories<repository_groups::virtuals>(const repository_groups::virtuals * const,
RepositoryFactory * const factory)
{
- std::tr1::shared_ptr<Set<std::string> > virtuals_formats(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > virtuals_formats(new Set<std::string>);
virtuals_formats->insert("virtuals");
factory->add_repository_format(
@@ -59,7 +59,7 @@ namespace paludis
&VirtualsRepository::repository_factory_dependencies
);
- std::tr1::shared_ptr<Set<std::string> > installed_virtuals_formats(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > installed_virtuals_formats(new Set<std::string>);
installed_virtuals_formats->insert("installed_virtuals");
installed_virtuals_formats->insert("installed-virtuals");
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index a5bbb366c..e680ae502 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -44,15 +44,15 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
-#include <tr1/functional>
-#include <tr1/unordered_map>
+#include <functional>
+#include <unordered_map>
#include <vector>
#include <utility>
#include <algorithm>
using namespace paludis;
-typedef std::tr1::unordered_map<QualifiedPackageName, std::tr1::shared_ptr<PackageIDSequence>, Hash<QualifiedPackageName> > IDMap;
+typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequence>, Hash<QualifiedPackageName> > IDMap;
namespace paludis
{
@@ -61,17 +61,17 @@ namespace paludis
{
const Environment * const env;
- const std::tr1::shared_ptr<Mutex> big_nasty_mutex;
+ const std::shared_ptr<Mutex> big_nasty_mutex;
- mutable std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > > names;
+ mutable std::vector<std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > > names;
mutable bool has_names;
mutable IDMap ids;
mutable bool has_ids;
- std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const Environment * const e, std::tr1::shared_ptr<Mutex> m = make_shared_ptr(new Mutex)) :
+ Implementation(const Environment * const e, std::shared_ptr<Mutex> m = make_shared_ptr(new Mutex)) :
env(e),
big_nasty_mutex(m),
has_names(false),
@@ -88,8 +88,8 @@ namespace
struct NamesNameComparator
{
bool
- operator() (const std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > & a,
- const std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > & b) const
+ operator() (const std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > & a,
+ const std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > & b) const
{
return a.first < b.first;
}
@@ -98,8 +98,8 @@ namespace
struct NamesSortComparator
{
bool
- operator() (const std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > & a,
- const std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > & b) const
+ operator() (const std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > & a,
+ const std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > & b) const
{
if (a.first < b.first)
return true;
@@ -112,8 +112,8 @@ namespace
struct NamesUniqueComparator
{
bool
- operator() (const std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > & a,
- const std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > & b) const
+ operator() (const std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > & a,
+ const std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > & b) const
{
return a.first == b.first && stringify(*a.second) == stringify(*b.second);
}
@@ -159,18 +159,18 @@ VirtualsRepository::need_names() const
if (! (**r).provides_interface())
continue;
- std::tr1::shared_ptr<const RepositoryProvidesInterface::ProvidesSequence> provides(
+ std::shared_ptr<const RepositoryProvidesInterface::ProvidesSequence> provides(
(**r).provides_interface()->provided_packages());
for (RepositoryProvidesInterface::ProvidesSequence::ConstIterator p(provides->begin()),
p_end(provides->end()) ; p != p_end ; ++p)
- _imp->names.push_back(std::make_pair((*p).virtual_name(), std::tr1::shared_ptr<const PackageDepSpec>(
+ _imp->names.push_back(std::make_pair((*p).virtual_name(), std::shared_ptr<const PackageDepSpec>(
new PackageDepSpec(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package((*p).provided_by()->name())))));
}
std::sort(_imp->names.begin(), _imp->names.end(), NamesSortComparator());
_imp->names.erase(std::unique(_imp->names.begin(), _imp->names.end(), NamesUniqueComparator()), _imp->names.end());
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > > new_names;
+ std::vector<std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > > new_names;
for (PackageDatabase::RepositoryConstIterator r(_imp->env->package_database()->begin_repositories()),
r_end(_imp->env->package_database()->end_repositories()) ; r != r_end ; ++r)
@@ -178,16 +178,16 @@ VirtualsRepository::need_names() const
if (! (**r).virtuals_interface())
continue;
- std::tr1::shared_ptr<const RepositoryVirtualsInterface::VirtualsSequence> virtuals(
+ std::shared_ptr<const RepositoryVirtualsInterface::VirtualsSequence> virtuals(
(**r).virtuals_interface()->virtual_packages());
for (RepositoryVirtualsInterface::VirtualsSequence::ConstIterator v(virtuals->begin()),
v_end(virtuals->end()) ; v != v_end ; ++v)
{
std::pair<
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator,
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator> p(
+ std::vector<std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > >::const_iterator,
+ std::vector<std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > >::const_iterator> p(
std::equal_range(_imp->names.begin(), _imp->names.end(),
- std::make_pair((*v).virtual_name(), std::tr1::shared_ptr<const PackageDepSpec>()),
+ std::make_pair((*v).virtual_name(), std::shared_ptr<const PackageDepSpec>()),
NamesNameComparator()));
if (p.first == p.second)
@@ -220,10 +220,10 @@ VirtualsRepository::need_ids() const
IDMap my_ids;
/* Populate our _imp->entries. */
- for (std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator
+ for (std::vector<std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > >::const_iterator
v(_imp->names.begin()), v_end(_imp->names.end()) ; v != v_end ; ++v)
{
- std::tr1::shared_ptr<const PackageIDSequence> matches((*_imp->env)[selection::AllVersionsSorted(
+ std::shared_ptr<const PackageIDSequence> matches((*_imp->env)[selection::AllVersionsSorted(
generator::Matches(*v->second, MatchPackageOptions()) |
filter::SupportsAction<InstallAction>())]);
@@ -238,7 +238,7 @@ VirtualsRepository::need_ids() const
if (my_ids.end() == i)
i = my_ids.insert(std::make_pair(v->first, make_shared_ptr(new PackageIDSequence))).first;
- std::tr1::shared_ptr<const PackageID> id(make_virtual_package_id(QualifiedPackageName(v->first), *m));
+ std::shared_ptr<const PackageID> id(make_virtual_package_id(QualifiedPackageName(v->first), *m));
if (stringify(id->name().category()) != "virtual")
throw InternalError(PALUDIS_HERE, "Got bad id '" + stringify(*id) + "'");
i->second->push_back(id);
@@ -249,40 +249,40 @@ VirtualsRepository::need_ids() const
swap(my_ids, _imp->ids);
}
-std::tr1::shared_ptr<const PackageIDSequence>
+std::shared_ptr<const PackageIDSequence>
VirtualsRepository::package_ids(const QualifiedPackageName & q) const
{
if (q.category().value() != "virtual")
- return std::tr1::shared_ptr<PackageIDSequence>(new PackageIDSequence);
+ return std::shared_ptr<PackageIDSequence>(new PackageIDSequence);
need_ids();
IDMap::const_iterator i(_imp->ids.find(q));
if (i == _imp->ids.end())
- return std::tr1::shared_ptr<PackageIDSequence>(new PackageIDSequence);
+ return std::shared_ptr<PackageIDSequence>(new PackageIDSequence);
return i->second;
}
-std::tr1::shared_ptr<const QualifiedPackageNameSet>
+std::shared_ptr<const QualifiedPackageNameSet>
VirtualsRepository::package_names(const CategoryNamePart & c) const
{
if (c.value() != "virtual")
- return std::tr1::shared_ptr<QualifiedPackageNameSet>(new QualifiedPackageNameSet);
+ return std::shared_ptr<QualifiedPackageNameSet>(new QualifiedPackageNameSet);
need_ids();
- std::tr1::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
+ std::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
std::transform(_imp->ids.begin(), _imp->ids.end(), result->inserter(),
- std::tr1::mem_fn(&std::pair<const QualifiedPackageName, std::tr1::shared_ptr<PackageIDSequence> >::first));
+ std::mem_fn(&std::pair<const QualifiedPackageName, std::shared_ptr<PackageIDSequence> >::first));
return result;
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
VirtualsRepository::category_names() const
{
- std::tr1::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
+ std::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
result->insert(CategoryNamePart("virtual"));
return result;
}
@@ -296,10 +296,10 @@ VirtualsRepository::has_package_named(const QualifiedPackageName & q) const
need_names();
std::pair<
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator,
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator> p(
+ std::vector<std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > >::const_iterator,
+ std::vector<std::pair<QualifiedPackageName, std::shared_ptr<const PackageDepSpec> > >::const_iterator> p(
std::equal_range(_imp->names.begin(), _imp->names.end(),
- std::make_pair(q, std::tr1::shared_ptr<const PackageDepSpec>()),
+ std::make_pair(q, std::shared_ptr<const PackageDepSpec>()),
NamesNameComparator()));
return p.first != p.second;
@@ -329,9 +329,9 @@ VirtualsRepository::invalidate_masks()
(*it2)->invalidate_masks();
}
-const std::tr1::shared_ptr<const PackageID>
+const std::shared_ptr<const PackageID>
VirtualsRepository::make_virtual_package_id(
- const QualifiedPackageName & virtual_name, const std::tr1::shared_ptr<const PackageID> & provider) const
+ const QualifiedPackageName & virtual_name, const std::shared_ptr<const PackageID> & provider) const
{
if (virtual_name.category().value() != "virtual")
throw InternalError(PALUDIS_HERE, "tried to make a virtual package id using '" + stringify(virtual_name) + "', '"
@@ -406,30 +406,30 @@ VirtualsRepository::some_ids_might_not_be_masked() const
return true;
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
VirtualsRepository::unimportant_category_names() const
{
- std::tr1::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
+ std::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
result->insert(CategoryNamePart("virtual"));
return result;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
VirtualsRepository::format_key() const
{
return _imp->format_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
VirtualsRepository::location_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::shared_ptr<const MetadataValueKey<FSEntry> >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
VirtualsRepository::installed_root_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::shared_ptr<const MetadataValueKey<FSEntry> >();
}
void
@@ -440,23 +440,23 @@ VirtualsRepository::need_keys_added() const
RepositoryName
VirtualsRepository::repository_factory_name(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> &)
+ const std::function<std::string (const std::string &)> &)
{
return RepositoryName("virtuals");
}
-std::tr1::shared_ptr<Repository>
+std::shared_ptr<Repository>
VirtualsRepository::repository_factory_create(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &)
+ const std::function<std::string (const std::string &)> &)
{
return make_shared_ptr(new VirtualsRepository(env));
}
-std::tr1::shared_ptr<const RepositoryNameSet>
+std::shared_ptr<const RepositoryNameSet>
VirtualsRepository::repository_factory_dependencies(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> &)
+ const std::function<std::string (const std::string &)> &)
{
return make_shared_ptr(new RepositoryNameSet);
}
@@ -473,18 +473,18 @@ VirtualsRepository::perform_hook(const Hook &)
}
bool
-VirtualsRepository::sync(const std::tr1::shared_ptr<OutputManager> &) const
+VirtualsRepository::sync(const std::shared_ptr<OutputManager> &) const
{
return false;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
VirtualsRepository::accept_keywords_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
VirtualsRepository::sync_host_key() const
{
return make_null_shared_ptr();
diff --git a/paludis/repositories/virtuals/virtuals_repository.hh b/paludis/repositories/virtuals/virtuals_repository.hh
index d488c99f2..e284f80aa 100644
--- a/paludis/repositories/virtuals/virtuals_repository.hh
+++ b/paludis/repositories/virtuals/virtuals_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/util/map-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -35,7 +35,7 @@ namespace paludis
public Repository,
public RepositoryMakeVirtualsInterface,
private PrivateImplementationPattern<VirtualsRepository>,
- public std::tr1::enable_shared_from_this<VirtualsRepository>
+ public std::enable_shared_from_this<VirtualsRepository>
{
private:
PrivateImplementationPattern<VirtualsRepository>::ImpPtr & _imp;
@@ -62,19 +62,19 @@ namespace paludis
static RepositoryName repository_factory_name(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<Repository> repository_factory_create(
+ static std::shared_ptr<Repository> repository_factory_create(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
+ static std::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
///\}
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
+ virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
virtual void invalidate();
@@ -86,15 +86,15 @@ namespace paludis
/* Repository */
- virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool has_package_named(const QualifiedPackageName &) const
@@ -107,21 +107,21 @@ namespace paludis
virtual bool some_ids_might_not_be_masked() const;
- virtual bool sync(const std::tr1::shared_ptr<OutputManager> &) const;
+ virtual bool sync(const std::shared_ptr<OutputManager> &) const;
/* RepositoryMakeVirtualsInterface */
- virtual const std::tr1::shared_ptr<const PackageID> make_virtual_package_id(
- const QualifiedPackageName & virtual_name, const std::tr1::shared_ptr<const PackageID> & provider) const
+ virtual const std::shared_ptr<const PackageID> make_virtual_package_id(
+ const QualifiedPackageName & virtual_name, const std::shared_ptr<const PackageID> & provider) const
PALUDIS_ATTRIBUTE((warn_unused_result));
/* Keys */
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
///\name Set methods
///\{
diff --git a/paludis/repositories/virtuals/virtuals_repository_TEST.cc b/paludis/repositories/virtuals/virtuals_repository_TEST.cc
index a93565266..11d574f0c 100644
--- a/paludis/repositories/virtuals/virtuals_repository_TEST.cc
+++ b/paludis/repositories/virtuals/virtuals_repository_TEST.cc
@@ -50,12 +50,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<VirtualsRepository> virtuals(new VirtualsRepository(&env));
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ std::shared_ptr<VirtualsRepository> virtuals(new VirtualsRepository(&env));
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
- std::tr1::shared_ptr<FakeInstalledRepository> installed(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -80,7 +80,7 @@ namespace test_cases
TEST_CHECK(virtuals->has_category_named(CategoryNamePart("virtual")));
TEST_CHECK(virtuals->has_package_named(QualifiedPackageName("virtual/pkg")));
- std::tr1::shared_ptr<const PackageIDSequence> r(env[selection::AllVersionsSorted(generator::All())]);
+ std::shared_ptr<const PackageIDSequence> r(env[selection::AllVersionsSorted(generator::All())]);
TEST_CHECK_STRINGIFY_EQUAL(join(indirect_iterator(r->begin()), indirect_iterator(r->end()), " | "),
"cat/pkg-1:0::repo | cat/pkg-2:0::repo | virtual/pkg-2::virtuals (virtual for cat/pkg-2:0::repo)");
}
@@ -93,16 +93,16 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<VirtualsRepository> virtuals(new VirtualsRepository(&env));
- const std::tr1::shared_ptr<FakeRepository> repo1(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ std::shared_ptr<VirtualsRepository> virtuals(new VirtualsRepository(&env));
+ const std::shared_ptr<FakeRepository> repo1(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo1")
)));
- const std::tr1::shared_ptr<FakeRepository> repo2(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo2(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo2")
)));
- std::tr1::shared_ptr<FakeInstalledRepository> installed(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -130,7 +130,7 @@ namespace test_cases
TEST_CHECK(virtuals->has_category_named(CategoryNamePart("virtual")));
TEST_CHECK(virtuals->has_package_named(QualifiedPackageName("virtual/pkg")));
- std::tr1::shared_ptr<const PackageIDSequence> r(env[selection::AllVersionsSorted(generator::All())]);
+ std::shared_ptr<const PackageIDSequence> r(env[selection::AllVersionsSorted(generator::All())]);
TEST_CHECK_STRINGIFY_EQUAL(join(indirect_iterator(r->begin()), indirect_iterator(r->end()), " | "),
"cat/pkg-1:0::repo1 | cat/pkg-2:0::repo1 | "
"virtual/foo-1::virtuals (virtual for cat/pkg-1:0::repo1) | "
@@ -146,12 +146,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<VirtualsRepository> virtuals(new VirtualsRepository(&env));
- const std::tr1::shared_ptr<FakeRepository> repo1(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ std::shared_ptr<VirtualsRepository> virtuals(new VirtualsRepository(&env));
+ const std::shared_ptr<FakeRepository> repo1(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo1")
)));
- const std::tr1::shared_ptr<FakeRepository> repo2(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo2(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo2")
)));
@@ -171,7 +171,7 @@ namespace test_cases
TEST_CHECK(virtuals->has_category_named(CategoryNamePart("virtual")));
TEST_CHECK(virtuals->has_package_named(QualifiedPackageName("virtual/pkg")));
- std::tr1::shared_ptr<const PackageIDSequence> r(env[selection::AllVersionsSorted(generator::All())]);
+ std::shared_ptr<const PackageIDSequence> r(env[selection::AllVersionsSorted(generator::All())]);
TEST_CHECK_STRINGIFY_EQUAL(join(indirect_iterator(r->begin()), indirect_iterator(r->end()), " | "),
"virtual/gkp-1:0::repo1 | virtual/pkg-1::virtuals (virtual for virtual/gkp-1:0::repo1) | "
"virtual/pkg-2:0::repo2 | virtual/pkg-2::virtuals (virtual for virtual/pkg-2:0::repo2)");