diff options
814 files changed, 12059 insertions, 12089 deletions
diff --git a/configure.ac b/configure.ac index 959092ead..cbade11bf 100644 --- a/configure.ac +++ b/configure.ac @@ -648,52 +648,53 @@ dnl }}} dnl {{{ check for hashes AC_MSG_CHECKING([for hashed associative containers]) AC_COMPILE_IFELSE([ -#include <tr1/unordered_map> +#include <unordered_map> int main(int, char **) { - std::tr1::unordered_map<int, int> m; + std::unordered_map<int, int> m; m.insert(std::make_pair(1, 2)); } ], - [AC_MSG_RESULT([std::tr1::unordered_map])], + [AC_MSG_RESULT([std::unordered_map])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Your compiler doesn't support tr1 unordered containers])]) + AC_MSG_ERROR([Your compiler doesn't support unordered containers])]) dnl }}} -dnl {{{ tr1 shared pointers -AC_MSG_CHECKING([for std::tr1::shared_ptr<>]) +dnl {{{ shared pointers +AC_MSG_CHECKING([for std::shared_ptr<>]) AC_COMPILE_IFELSE([ -#include <tr1/memory> +#include <memory> int main(int, char **) { - std::tr1::shared_ptr<int> x(new int(10)); + std::shared_ptr<int> x(new int(10)); + x = std::make_shared<int>(20); return *x; } ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Your compiler doesn't support tr1 shared pointers])]) + AC_MSG_ERROR([Your compiler doesn't support shared pointers])]) dnl }}} -dnl {{{ tr1 type traits -AC_MSG_CHECKING([for std::tr1::remove_pointer<>]) +dnl {{{ type traits +AC_MSG_CHECKING([for std::remove_pointer<>]) AC_COMPILE_IFELSE([ -#include <tr1/type_traits> +#include <type_traits> int main(int, char **) { - std::tr1::remove_pointer<int *>::type x(10); + std::remove_pointer<int *>::type x(10); return x; } ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Your compiler doesn't support tr1 type traits])]) + AC_MSG_ERROR([Your compiler doesn't support type traits])]) dnl }}} -dnl {{{ tr1 binders -AC_MSG_CHECKING([for std::tr1::bind<>]) +dnl {{{ binders +AC_MSG_CHECKING([for std::bind<>]) AC_COMPILE_IFELSE([ -#include <tr1/functional> +#include <functional> #include <functional> #include <algorithm> #include <list> @@ -705,16 +706,16 @@ struct S }; int main(int, char **) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; std::list<int> l; S s; std::for_each(l.begin(), l.end(), - std::tr1::bind(std::tr1::mem_fn(&S::x), &s, _1)); + std::bind(std::mem_fn(&S::x), &s, _1)); } ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Your compiler doesn't support tr1 functional])]) + AC_MSG_ERROR([Your compiler doesn't support functional])]) dnl }}} dnl {{{ std::next diff --git a/doc/api/cplusplus/examples/example_action.cc b/doc/api/cplusplus/examples/example_action.cc index dbbe9f007..b6a4b3a30 100644 --- a/doc/api/cplusplus/examples/example_action.cc +++ b/doc/api/cplusplus/examples/example_action.cc @@ -30,7 +30,7 @@ namespace * we just use a StandardOutputManager, which sticks everything to stdout / * stderr. More complex clients may use Environment::create_output_manager * to use the user's preferences for logging etc. */ - std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &) + std::shared_ptr<OutputManager> make_standard_output_manager(const Action &) { return make_shared_ptr(new StandardOutputManager); } @@ -46,11 +46,11 @@ int main(int argc, char * argv[]) "example_action", "EXAMPLE_ACTION_OPTIONS", "EXAMPLE_ACTION_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Fetch package IDs for 'sys-apps/paludis'. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( generator::Package(QualifiedPackageName("sys-apps/paludis")))]); /* For each ID: */ @@ -58,7 +58,7 @@ int main(int argc, char * argv[]) i != i_end ; ++i) { /* Failures go here: */ - const std::tr1::shared_ptr<Sequence<FetchActionFailure> > failures(new Sequence<FetchActionFailure>); + const std::shared_ptr<Sequence<FetchActionFailure> > failures(new Sequence<FetchActionFailure>); /* Do we support a FetchAction? We find out by creating a * SupportsActionTest<FetchAction> object, and querying via the @@ -84,7 +84,7 @@ int main(int argc, char * argv[]) n::ignore_unfetched() = false, n::make_output_manager() = &make_standard_output_manager, n::safe_resume() = true, - n::want_phase() = std::tr1::bind(return_literal_function(wp_yes)) + n::want_phase() = std::bind(return_literal_function(wp_yes)) )); try { diff --git a/doc/api/cplusplus/examples/example_contents.cc b/doc/api/cplusplus/examples/example_contents.cc index 32d9e2ebc..58e910c3f 100644 --- a/doc/api/cplusplus/examples/example_contents.cc +++ b/doc/api/cplusplus/examples/example_contents.cc @@ -66,11 +66,11 @@ int main(int argc, char * argv[]) "example_contents", "EXAMPLE_CONTENTS_OPTIONS", "EXAMPLE_CONTENTS_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Fetch package IDs for installed 'sys-apps/paludis'. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( generator::Package(QualifiedPackageName("sys-apps/paludis")) | filter::InstalledAtRoot(FSEntry("/")))]); @@ -90,7 +90,7 @@ int main(int argc, char * argv[]) /* Visit the contents key's value's entries with our visitor. We use * indirect_iterator because value()->begin() and ->end() return - * iterators to std::tr1::shared_ptr<>s rather than raw objects. */ + * iterators to std::shared_ptr<>s rather than raw objects. */ ContentsPrinter p; std::for_each( indirect_iterator((*i)->contents_key()->value()->begin()), diff --git a/doc/api/cplusplus/examples/example_dep_label.cc b/doc/api/cplusplus/examples/example_dep_label.cc index db1908a70..8c01e978c 100644 --- a/doc/api/cplusplus/examples/example_dep_label.cc +++ b/doc/api/cplusplus/examples/example_dep_label.cc @@ -148,11 +148,11 @@ int main(int argc, char * argv[]) "example_dep_label", "EXAMPLE_DEP_LABEL_OPTIONS", "EXAMPLE_DEP_LABEL_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Fetch package IDs for all installed packages. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted( + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted( generator::All() | filter::InstalledAtRoot(FSEntry("/")))]); diff --git a/doc/api/cplusplus/examples/example_dep_spec.cc b/doc/api/cplusplus/examples/example_dep_spec.cc index 2c7ebd369..c71de3067 100644 --- a/doc/api/cplusplus/examples/example_dep_spec.cc +++ b/doc/api/cplusplus/examples/example_dep_spec.cc @@ -40,7 +40,7 @@ int main(int argc, char * argv[]) "example_dep_spec", "EXAMPLE_DEP_SPEC_OPTIONS", "EXAMPLE_DEP_SPEC_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* For each command line parameter... */ @@ -142,7 +142,7 @@ int main(int argc, char * argv[]) /* And display packages matching that spec */ cout << " " << left << setw(24) << "Matches:" << " "; - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()))]); + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()))]); bool need_indent(false); for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ; i != i_end ; ++i) diff --git a/doc/api/cplusplus/examples/example_dep_spec_flattener.cc b/doc/api/cplusplus/examples/example_dep_spec_flattener.cc index 06c57fbe8..d9308531d 100644 --- a/doc/api/cplusplus/examples/example_dep_spec_flattener.cc +++ b/doc/api/cplusplus/examples/example_dep_spec_flattener.cc @@ -38,11 +38,11 @@ int main(int argc, char * argv[]) "example_dep_spec_flattener", "EXAMPLE_DEP_SPEC_FLATTENER_OPTIONS", "EXAMPLE_DEP_SPEC_FLATTENER_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Fetch package IDs for all installed packages. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( generator::All() | filter::InstalledAtRoot(FSEntry("/")))]); @@ -63,7 +63,7 @@ int main(int argc, char * argv[]) (*i)->provide_key()->value()->root()->accept(provides); /* The results are available through DepSpecFlattener::begin() - * and ::end(). These return an iterator to a std::tr1::shared_ptr<>, + * and ::end(). These return an iterator to a std::shared_ptr<>, * so we use indirect_iterator to add a level of dereferencing.*/ cout << " " << left << setw(24) << "Provides:" << " " << join(indirect_iterator(provides.begin()), indirect_iterator(provides.end()), " ") diff --git a/doc/api/cplusplus/examples/example_dep_tag.cc b/doc/api/cplusplus/examples/example_dep_tag.cc index 4b05cdcd5..e3b85ac22 100644 --- a/doc/api/cplusplus/examples/example_dep_tag.cc +++ b/doc/api/cplusplus/examples/example_dep_tag.cc @@ -77,11 +77,11 @@ namespace /* Display information about a named set. */ void display_set( - const std::tr1::shared_ptr<const Environment> & env, + const std::shared_ptr<const Environment> & env, const SetName & name, SeenCategories & seen_categories) { - std::tr1::shared_ptr<const SetSpecTree> set(env->set(name)); + std::shared_ptr<const SetSpecTree> set(env->set(name)); /* Environment::set can return a zero pointer, if a set is not known. */ if (! set) @@ -131,7 +131,7 @@ int main(int argc, char * argv[]) "example_dep_tag", "EXAMPLE_DEP_TAG_OPTIONS", "EXAMPLE_DEP_TAG_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); SeenCategories seen_categories; @@ -150,7 +150,7 @@ int main(int argc, char * argv[]) cout << " " << *s << ":" << endl; /* Fetch the category. */ - std::tr1::shared_ptr<const DepTagCategory> category(DepTagCategoryFactory::get_instance()->create(*s)); + std::shared_ptr<const DepTagCategory> category(DepTagCategoryFactory::get_instance()->create(*s)); cout << left << setw(20) << " Visible:" << " " << boolalpha << category->visible() << endl; cout << left << setw(20) << " ID:" << " " << category->id() << endl; diff --git a/doc/api/cplusplus/examples/example_environment.cc b/doc/api/cplusplus/examples/example_environment.cc index 3b10f0dff..d78ddc620 100644 --- a/doc/api/cplusplus/examples/example_environment.cc +++ b/doc/api/cplusplus/examples/example_environment.cc @@ -43,7 +43,7 @@ int main(int argc, char * argv[]) * the environment class to use (e.g. 'paludis', 'portage') and the * second part is passed as parameters to be handled by that * environment's constructor. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* A lot of the Environment members aren't very useful to clients. The @@ -55,7 +55,7 @@ int main(int argc, char * argv[]) * The package database has its own examples, so we'll start with sets: * */ - std::tr1::shared_ptr<const SetSpecTree> world(env->set(SetName("world"))); + std::shared_ptr<const SetSpecTree> world(env->set(SetName("world"))); if (world) { cout << "World set exists" << endl; diff --git a/doc/api/cplusplus/examples/example_formatter.cc b/doc/api/cplusplus/examples/example_formatter.cc index 240163c19..2a8069870 100644 --- a/doc/api/cplusplus/examples/example_formatter.cc +++ b/doc/api/cplusplus/examples/example_formatter.cc @@ -165,11 +165,11 @@ int main(int argc, char * argv[]) "example_formatter", "EXAMPLE_FORMATTER_OPTIONS", "EXAMPLE_FORMATTER_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Fetch package IDs for installable 'sys-apps/paludis'. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( generator::Package(QualifiedPackageName("sys-apps/paludis")) | filter::SupportsAction<InstallAction>())]); diff --git a/doc/api/cplusplus/examples/example_mask.cc b/doc/api/cplusplus/examples/example_mask.cc index 06fc2a461..de3de72f2 100644 --- a/doc/api/cplusplus/examples/example_mask.cc +++ b/doc/api/cplusplus/examples/example_mask.cc @@ -79,11 +79,11 @@ int main(int argc, char * argv[]) "example_mask", "EXAMPLE_MASK_OPTIONS", "EXAMPLE_MASK_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Fetch package IDs for 'sys-apps/paludis'. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( generator::Package(QualifiedPackageName("sys-apps/paludis")))]); /* For each ID: */ diff --git a/doc/api/cplusplus/examples/example_match_package.cc b/doc/api/cplusplus/examples/example_match_package.cc index 79b9e982e..782473a12 100644 --- a/doc/api/cplusplus/examples/example_match_package.cc +++ b/doc/api/cplusplus/examples/example_match_package.cc @@ -36,17 +36,17 @@ int main(int argc, char * argv[]) "example_match_package", "EXAMPLE_MATCH_PACKAGE_OPTIONS", "EXAMPLE_MATCH_PACKAGE_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Fetch all installed packages. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( generator::All() | filter::InstalledAtRoot(FSEntry("/")))]); /* Fetch the 'system' and 'world' sets. Ordinarily we should check for * zero pointers here, but these two sets will always exist. */ - std::tr1::shared_ptr<const SetSpecTree> system(env->set(SetName("system"))), + std::shared_ptr<const SetSpecTree> system(env->set(SetName("system"))), world(env->set(SetName("world"))); /* For each ID: */ diff --git a/doc/api/cplusplus/examples/example_metadata_key.cc b/doc/api/cplusplus/examples/example_metadata_key.cc index b705f9165..21cd85fe4 100644 --- a/doc/api/cplusplus/examples/example_metadata_key.cc +++ b/doc/api/cplusplus/examples/example_metadata_key.cc @@ -81,10 +81,10 @@ namespace cout << indent << left << setw(30) << " Value:" << " " << key.value() << endl; } - void visit(const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > & key) + void visit(const MetadataValueKey<std::shared_ptr<const PackageID> > & key) { cout << indent << left << setw(30) << " Class:" << " " << - "MetadataValueKey<std::tr1::shared_ptr<const PackageID> >" << endl; + "MetadataValueKey<std::shared_ptr<const PackageID> >" << endl; cout << indent << left << setw(30) << " Value:" << " " << *key.value() << endl; } @@ -95,29 +95,29 @@ namespace cout << indent << left << setw(30) << " Value:" << " " << pretty_print_time(key.value().seconds()) << endl; } - void visit(const MetadataValueKey<std::tr1::shared_ptr<const Contents> > &) + void visit(const MetadataValueKey<std::shared_ptr<const Contents> > &) { cout << indent << left << setw(30) << " Class:" << " " << - "MetadataValueKey<std::tr1::shared_ptr<const Contents> > " << endl; + "MetadataValueKey<std::shared_ptr<const Contents> > " << endl; /* We won't display the contents of the contents key here, since * it involves creating another visitor. See \ref * example_contents.cc "example_contents.cc" for that. */ } - void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > &) + void visit(const MetadataValueKey<std::shared_ptr<const Choices> > &) { cout << indent << left << setw(30) << " Class:" << " " << - "MetadataValueKey<std::tr1::shared_ptr<const Choices> > " << endl; + "MetadataValueKey<std::shared_ptr<const Choices> > " << endl; /* We won't display the contents of the choices key here, since * it has its own examples. */ } - void visit(const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > & key) + void visit(const MetadataValueKey<std::shared_ptr<const RepositoryMaskInfo> > & key) { cout << indent << left << setw(30) << " Class:" << " " << - "MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> >" << endl; + "MetadataValueKey<std::shared_ptr<const RepositoryMaskInfo> >" << endl; - /* MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> >::value() + /* MetadataValueKey<std::shared_ptr<const RepositoryMaskInfo> >::value() * can return a zero pointer. Other keys can't. */ if (key.value()) { @@ -257,11 +257,11 @@ int main(int argc, char * argv[]) "example_metadata_key", "EXAMPLE_METADATA_KEY_OPTIONS", "EXAMPLE_METADATA_KEY_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Fetch package IDs for 'sys-apps/paludis'. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( generator::Package(QualifiedPackageName("sys-apps/paludis")))]); /* For each ID: */ @@ -274,7 +274,7 @@ int main(int argc, char * argv[]) for (PackageID::MetadataConstIterator k((*i)->begin_metadata()), k_end((*i)->end_metadata()) ; k != k_end ; ++k) { - /* Display it. Note that PackageID::MetadataConstIterator returns a std::tr1::shared_ptr + /* Display it. Note that PackageID::MetadataConstIterator returns a std::shared_ptr * to a key, so we dereference twice (or we could have used IndirectIterator). */ show_key(**k); cout << endl; @@ -295,7 +295,7 @@ int main(int argc, char * argv[]) k != k_end ; ++k) { /* Display it. Repository::MetadataConstIterator also returns a - * std::tr1::shared_ptr to the key. */ + * std::shared_ptr to the key. */ show_key(**k); cout << endl; } diff --git a/doc/api/cplusplus/examples/example_package_database.cc b/doc/api/cplusplus/examples/example_package_database.cc index 03acc0408..87ab20f43 100644 --- a/doc/api/cplusplus/examples/example_package_database.cc +++ b/doc/api/cplusplus/examples/example_package_database.cc @@ -37,13 +37,13 @@ int main(int argc, char * argv[]) "example_package_database", "EXAMPLE_PACKAGE_DATABASE_OPTIONS", "EXAMPLE_PACKAGE_DATABASE_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Mostly PackageDatabase is used by Environment. But some methods are useful: */ if (env->package_database()->has_repository_named(RepositoryName("gentoo"))) { - std::tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(RepositoryName("gentoo"))); + std::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(RepositoryName("gentoo"))); cout << "Repository 'gentoo' exists, and has format '" << (repo->format_key() ? repo->format_key()->value() : "") << "'" << endl; } diff --git a/doc/api/cplusplus/examples/example_package_id.cc b/doc/api/cplusplus/examples/example_package_id.cc index b1653dc6d..040caf166 100644 --- a/doc/api/cplusplus/examples/example_package_id.cc +++ b/doc/api/cplusplus/examples/example_package_id.cc @@ -42,11 +42,11 @@ int main(int argc, char * argv[]) "example_package_id", "EXAMPLE_PACKAGE_ID_OPTIONS", "EXAMPLE_PACKAGE_ID_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Fetch package IDs for 'sys-apps/paludis'. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( generator::Package(QualifiedPackageName("sys-apps/paludis")))]); /* For each ID: */ @@ -118,7 +118,7 @@ int main(int argc, char * argv[]) /* And various misc methods. Clients don't usually use these * directly. */ - std::tr1::shared_ptr<const Set<std::string> > breaks_portage((*i)->breaks_portage()); + std::shared_ptr<const Set<std::string> > breaks_portage((*i)->breaks_portage()); cout << left << setw(30) << " breaks_portage:" << " " << join(breaks_portage->begin(), breaks_portage->end(), ", ") << endl; cout << left << setw(30) << " extra_hash_value:" << " " << "0x" << hex << (*i)->extra_hash_value() << endl; diff --git a/doc/api/cplusplus/examples/example_repository.cc b/doc/api/cplusplus/examples/example_repository.cc index fc3ea27b8..54f06819f 100644 --- a/doc/api/cplusplus/examples/example_repository.cc +++ b/doc/api/cplusplus/examples/example_repository.cc @@ -35,7 +35,7 @@ int main(int argc, char * argv[]) "example_environment", "EXAMPLE_ENVIRONMENT_OPTIONS", "EXAMPLE_ENVIRONMENT_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* For each repository... */ @@ -61,9 +61,9 @@ int main(int argc, char * argv[]) * packages, IDs and so on. These methods are used by * PackageDatabase::query, but are also sometimes of direct use to * clients. */ - std::tr1::shared_ptr<const CategoryNamePartSet> cats((*r)->category_names()); + std::shared_ptr<const CategoryNamePartSet> cats((*r)->category_names()); cout << left << setw(30) << " Number of categories:" << " " << cats->size() << endl; - std::tr1::shared_ptr<const PackageIDSequence> ids((*r)->package_ids(QualifiedPackageName("sys-apps/paludis"))); + std::shared_ptr<const PackageIDSequence> ids((*r)->package_ids(QualifiedPackageName("sys-apps/paludis"))); cout << left << setw(30) << " IDs for sys-apps/paludis:" << " " << join(indirect_iterator(ids->begin()), indirect_iterator(ids->end()), " ") << endl; diff --git a/doc/api/cplusplus/examples/example_selection.cc b/doc/api/cplusplus/examples/example_selection.cc index 5d60b1b25..18941520e 100644 --- a/doc/api/cplusplus/examples/example_selection.cc +++ b/doc/api/cplusplus/examples/example_selection.cc @@ -28,14 +28,14 @@ using std::endl; namespace { /* Run a particular selection, and show its results. */ - void show_selection(const std::tr1::shared_ptr<const Environment> & env, const Selection & selection) + void show_selection(const std::shared_ptr<const Environment> & env, const Selection & selection) { /* Selections support a crude form of stringification. */ cout << selection << ":" << endl; /* Usually the only thing clients will do with a Selection object is pass it * to Environment::operator[]. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection]); + std::shared_ptr<const PackageIDSequence> ids((*env)[selection]); /* Show the results */ if (! ids->empty()) @@ -55,7 +55,7 @@ int main(int argc, char * argv[]) "example_selection", "EXAMPLE_SELECTION_OPTIONS", "EXAMPLE_SELECTION_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Make some selections, and display what they give. The selection diff --git a/doc/api/cplusplus/examples/example_stringify_formatter.cc b/doc/api/cplusplus/examples/example_stringify_formatter.cc index 7dda45b0f..343a92d2c 100644 --- a/doc/api/cplusplus/examples/example_stringify_formatter.cc +++ b/doc/api/cplusplus/examples/example_stringify_formatter.cc @@ -34,11 +34,11 @@ int main(int argc, char * argv[]) "example_stringify_formatter", "EXAMPLE_STRINGIFY_FORMATTER_OPTIONS", "EXAMPLE_STRINGIFY_FORMATTER_CMDLINE"); /* We start with an Environment, respecting the user's '--environment' choice. */ - std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( + std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create( CommandLine::get_instance()->a_environment.argument())); /* Fetch package IDs for installable 'sys-apps/paludis'. */ - std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted( generator::Package(QualifiedPackageName("sys-apps/paludis")) | filter::SupportsAction<InstallAction>())]); diff --git a/paludis/about_metadata.cc b/paludis/about_metadata.cc index 9e2b36517..5790fe1e4 100644 --- a/paludis/about_metadata.cc +++ b/paludis/about_metadata.cc @@ -30,13 +30,13 @@ namespace paludis template <> struct Implementation<AboutMetadata> { - std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > package_key; - std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > version_key; + std::shared_ptr<LiteralMetadataValueKey<std::string> > package_key; + std::shared_ptr<LiteralMetadataValueKey<std::string> > version_key; - std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > build_cxxflags_key; - std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > build_ldflags_key; - std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > build_cxx_key; - std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > build_date_key; + std::shared_ptr<LiteralMetadataValueKey<std::string> > build_cxxflags_key; + std::shared_ptr<LiteralMetadataValueKey<std::string> > build_ldflags_key; + std::shared_ptr<LiteralMetadataValueKey<std::string> > build_cxx_key; + std::shared_ptr<LiteralMetadataValueKey<std::string> > build_date_key; Implementation() : package_key(new LiteralMetadataValueKey<std::string>("PALUDIS_PACKAGE", "Package Name", mkt_significant, PALUDIS_PACKAGE)), diff --git a/paludis/action.hh b/paludis/action.hh index 6ddc9e51e..124bea64b 100644 --- a/paludis/action.hh +++ b/paludis/action.hh @@ -33,7 +33,7 @@ #include <paludis/util/options.hh> #include <paludis/output_manager-fwd.hh> #include <paludis/util/type_list.hh> -#include <tr1/functional> +#include <functional> /** \file * Declarations for action-related classes. @@ -84,7 +84,7 @@ namespace paludis * * \since 0.40 */ - NamedValue<n::errors, std::tr1::shared_ptr<Sequence<FetchActionFailure> > > errors; + NamedValue<n::errors, std::shared_ptr<Sequence<FetchActionFailure> > > errors; /** * \since 0.32 @@ -121,7 +121,7 @@ namespace paludis * * \since 0.36 */ - NamedValue<n::make_output_manager, std::tr1::function<std::tr1::shared_ptr<OutputManager> ( + NamedValue<n::make_output_manager, std::function<std::shared_ptr<OutputManager> ( const FetchAction &)> > make_output_manager; @@ -130,7 +130,7 @@ namespace paludis /** * \since 0.48 */ - NamedValue<n::want_phase, std::tr1::function<WantPhase (const std::string &)> > want_phase; + NamedValue<n::want_phase, std::function<WantPhase (const std::string &)> > want_phase; }; /** @@ -142,7 +142,7 @@ namespace paludis */ struct InstallActionOptions { - NamedValue<n::destination, std::tr1::shared_ptr<Repository> > destination; + NamedValue<n::destination, std::shared_ptr<Repository> > destination; /** * This is a function to avoid chicken / egg problems when using @@ -150,7 +150,7 @@ namespace paludis * * \since 0.36 */ - NamedValue<n::make_output_manager, std::tr1::function<std::tr1::shared_ptr<OutputManager> ( + NamedValue<n::make_output_manager, std::function<std::shared_ptr<OutputManager> ( const InstallAction &)> > make_output_manager; /** @@ -162,8 +162,8 @@ namespace paludis * * \since 0.36 */ - NamedValue<n::perform_uninstall, std::tr1::function<void ( - const std::tr1::shared_ptr<const PackageID> &, + NamedValue<n::perform_uninstall, std::function<void ( + const std::shared_ptr<const PackageID> &, const UninstallActionOptions & )> > perform_uninstall; @@ -172,9 +172,9 @@ namespace paludis * * \since 0.36 */ - NamedValue<n::replacing, std::tr1::shared_ptr<const PackageIDSequence> > replacing; + NamedValue<n::replacing, std::shared_ptr<const PackageIDSequence> > replacing; - NamedValue<n::want_phase, std::tr1::function<WantPhase (const std::string &)> > want_phase; + NamedValue<n::want_phase, std::function<WantPhase (const std::string &)> > want_phase; }; /** @@ -194,14 +194,14 @@ namespace paludis * * \since 0.36 */ - NamedValue<n::if_for_install_id, std::tr1::shared_ptr<const PackageID> > if_for_install_id; + NamedValue<n::if_for_install_id, std::shared_ptr<const PackageID> > if_for_install_id; /** * Sometimes we never want to unmerge certain files. * * \since 0,38 */ - NamedValue<n::ignore_for_unmerge, std::tr1::function<bool (const FSEntry &)> > ignore_for_unmerge; + NamedValue<n::ignore_for_unmerge, std::function<bool (const FSEntry &)> > ignore_for_unmerge; /** * Some repositories need to do special handlings for direct overwrites @@ -217,7 +217,7 @@ namespace paludis * * \since 0.36 */ - NamedValue<n::make_output_manager, std::tr1::function<std::tr1::shared_ptr<OutputManager> ( + NamedValue<n::make_output_manager, std::function<std::shared_ptr<OutputManager> ( const UninstallAction &)> > make_output_manager; }; @@ -370,7 +370,7 @@ namespace paludis * * \since 0.36 */ - NamedValue<n::make_output_manager, std::tr1::function<std::tr1::shared_ptr<OutputManager> ( + NamedValue<n::make_output_manager, std::function<std::shared_ptr<OutputManager> ( const PretendAction &)> > make_output_manager; }; @@ -463,7 +463,7 @@ namespace paludis * * \since 0.36 */ - NamedValue<n::make_output_manager, std::tr1::function<std::tr1::shared_ptr<OutputManager> ( + NamedValue<n::make_output_manager, std::function<std::shared_ptr<OutputManager> ( const ConfigAction &)> > make_output_manager; }; @@ -518,7 +518,7 @@ namespace paludis * * \since 0.36 */ - NamedValue<n::make_output_manager, std::tr1::function<std::tr1::shared_ptr<OutputManager> ( + NamedValue<n::make_output_manager, std::function<std::shared_ptr<OutputManager> ( const InfoAction &)> > make_output_manager; }; diff --git a/paludis/args/args_handler.cc b/paludis/args/args_handler.cc index ab985b486..a9fe8ce38 100644 --- a/paludis/args/args_handler.cc +++ b/paludis/args/args_handler.cc @@ -32,7 +32,7 @@ #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/sequence-impl.hh> -#include <tr1/memory> +#include <memory> #include <algorithm> #include <sstream> #include <list> @@ -59,12 +59,12 @@ namespace paludis std::list<std::string> notes; std::list<std::string> descriptions; std::list<std::pair<std::string, int> > see_alsos; - std::tr1::shared_ptr<Sequence<std::string> > separate_after_dashes_args; + std::shared_ptr<Sequence<std::string> > separate_after_dashes_args; std::map<std::string, ArgsOption *> longopts; std::map<char, ArgsOption *> shortopts; - std::tr1::shared_ptr<ArgsSection> main_options_section; + std::shared_ptr<ArgsSection> main_options_section; Implementation() : separate_after_dashes_args(new Sequence<std::string>) @@ -174,7 +174,7 @@ ArgsHandler::add(ArgsSection * const s) void ArgsHandler::run( - const std::tr1::shared_ptr<const Sequence<std::string> > & argseq, + const std::shared_ptr<const Sequence<std::string> > & argseq, const std::string & client, const std::string & env_var, const std::string & env_prefix, @@ -292,7 +292,7 @@ ArgsHandler::run( const std::string & env_prefix, const ArgsHandlerOptions & options) { - std::tr1::shared_ptr<Sequence<std::string> > s(new Sequence<std::string>); + std::shared_ptr<Sequence<std::string> > s(new Sequence<std::string>); std::copy(&argv[1], &argv[argc], create_inserter<std::string>(s->back_inserter())); run(s, client, env_var, env_prefix, options); } @@ -465,7 +465,7 @@ ArgsHandler::add_description_line(const std::string & e) _imp->descriptions.push_back(e); } -const std::tr1::shared_ptr<const Sequence<std::string> > +const std::shared_ptr<const Sequence<std::string> > ArgsHandler::separate_after_dashes_args() const { return _imp->separate_after_dashes_args; diff --git a/paludis/args/args_handler.hh b/paludis/args/args_handler.hh index 989098252..237eccecb 100644 --- a/paludis/args/args_handler.hh +++ b/paludis/args/args_handler.hh @@ -25,7 +25,7 @@ #include <paludis/util/private_implementation_pattern.hh> #include <paludis/util/options.hh> #include <paludis/util/sequence.hh> -#include <tr1/memory> +#include <memory> #include <iosfwd> #include <string> @@ -141,7 +141,7 @@ namespace paludis * * \since 0.47 */ - const std::tr1::shared_ptr<const Sequence<std::string> > separate_after_dashes_args() const + const std::shared_ptr<const Sequence<std::string> > separate_after_dashes_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); ///\} @@ -308,7 +308,7 @@ namespace paludis * a prefix to export our command line via the environment. */ void run( - const std::tr1::shared_ptr<const Sequence<std::string> > &, + const std::shared_ptr<const Sequence<std::string> > &, const std::string & client, const std::string & env_var, const std::string & env_prefix, diff --git a/paludis/args/args_option.cc b/paludis/args/args_option.cc index 9cb2c63e4..9f6fce2f0 100644 --- a/paludis/args/args_option.cc +++ b/paludis/args/args_option.cc @@ -101,10 +101,10 @@ SwitchArg::forwardable_string() const return ""; } -const std::tr1::shared_ptr<Sequence<std::string> > +const std::shared_ptr<Sequence<std::string> > SwitchArg::forwardable_args() const { - std::tr1::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); + std::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); if (specified()) result->push_back("--" + long_name()); return result; @@ -122,10 +122,10 @@ AliasArg::forwardable_string() const return ""; } -const std::tr1::shared_ptr<Sequence<std::string> > +const std::shared_ptr<Sequence<std::string> > AliasArg::forwardable_args() const { - std::tr1::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); + std::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); return result; } @@ -153,10 +153,10 @@ StringArg::forwardable_string() const return ""; } -const std::tr1::shared_ptr<Sequence<std::string> > +const std::shared_ptr<Sequence<std::string> > StringArg::forwardable_args() const { - std::tr1::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); + std::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); if (specified()) { result->push_back("--" + long_name()); @@ -253,10 +253,10 @@ StringSetArg::forwardable_string() const return ""; } -const std::tr1::shared_ptr<Sequence<std::string> > +const std::shared_ptr<Sequence<std::string> > StringSetArg::forwardable_args() const { - std::tr1::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); + std::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); if (specified()) { for (ConstIterator i(begin_args()), i_end(end_args()) ; @@ -324,10 +324,10 @@ StringSequenceArg::forwardable_string() const return ""; } -const std::tr1::shared_ptr<Sequence<std::string> > +const std::shared_ptr<Sequence<std::string> > StringSequenceArg::forwardable_args() const { - std::tr1::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); + std::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); if (specified()) { for (ConstIterator i(begin_args()), i_end(end_args()) ; @@ -355,10 +355,10 @@ IntegerArg::forwardable_string() const return ""; } -const std::tr1::shared_ptr<Sequence<std::string> > +const std::shared_ptr<Sequence<std::string> > IntegerArg::forwardable_args() const { - std::tr1::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); + std::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); if (specified()) { result->push_back("--" + long_name()); @@ -530,10 +530,10 @@ EnumArg::forwardable_string() const return ""; } -const std::tr1::shared_ptr<Sequence<std::string> > +const std::shared_ptr<Sequence<std::string> > EnumArg::forwardable_args() const { - std::tr1::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); + std::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>); if (specified()) { result->push_back("--" + long_name()); diff --git a/paludis/args/args_option.hh b/paludis/args/args_option.hh index e58df1d13..a61266527 100644 --- a/paludis/args/args_option.hh +++ b/paludis/args/args_option.hh @@ -27,7 +27,7 @@ #include <paludis/util/named_value.hh> #include <paludis/util/simple_visitor.hh> #include <paludis/util/sequence-fwd.hh> -#include <tr1/memory> +#include <memory> /** \file * Declarations for ArgsOption. @@ -175,7 +175,7 @@ namespace paludis * * \since 0.46 */ - virtual const std::tr1::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; + virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; }; /** @@ -205,7 +205,7 @@ namespace paludis virtual bool can_be_negated() const; virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::tr1::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -248,7 +248,7 @@ namespace paludis virtual bool can_be_negated() const; virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::tr1::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -353,7 +353,7 @@ namespace paludis virtual bool can_be_negated() const; virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::tr1::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -399,7 +399,7 @@ namespace paludis virtual bool can_be_negated() const; virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::tr1::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -453,7 +453,7 @@ namespace paludis virtual bool can_be_negated() const; virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::tr1::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -487,7 +487,7 @@ namespace paludis virtual bool can_be_negated() const; virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::tr1::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -617,7 +617,7 @@ namespace paludis virtual bool can_be_negated() const; virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::tr1::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/args/dep_list_args_group.cc b/paludis/args/dep_list_args_group.cc index 0cf73b5a4..90a21e27b 100644 --- a/paludis/args/dep_list_args_group.cc +++ b/paludis/args/dep_list_args_group.cc @@ -160,7 +160,7 @@ DepListArgsGroup::~DepListArgsGroup() void DepListArgsGroup::populate_dep_list_options(const Environment * env, DepListOptions & options) const { - using namespace std::tr1::placeholders; + using namespace std::placeholders; if (dl_reinstall.argument() == "never") options.reinstall() = dl_reinstall_never; @@ -232,8 +232,8 @@ DepListArgsGroup::populate_dep_list_options(const Environment * env, DepListOpti if (! options.override_masks()) options.override_masks().reset(new DepListOverrideMasksFunctions); - options.override_masks()->push_back(std::tr1::bind(&override_tilde_keywords, env, _1, _2)); - options.override_masks()->push_back(std::tr1::bind(&override_license, _2)); + options.override_masks()->push_back(std::bind(&override_tilde_keywords, env, _1, _2)); + options.override_masks()->push_back(std::bind(&override_license, _2)); if (dl_override_masks.specified()) { @@ -246,13 +246,13 @@ DepListArgsGroup::populate_dep_list_options(const Environment * env, DepListOpti a_end(dl_override_masks.end_args()) ; a != a_end ; ++a) { if (*a == "tilde-keyword") - options.override_masks()->push_back(std::tr1::bind(&override_tilde_keywords, env, _1, _2)); + options.override_masks()->push_back(std::bind(&override_tilde_keywords, env, _1, _2)); else if (*a == "unkeyworded") - options.override_masks()->push_back(std::tr1::bind(&override_unkeyworded, env, _1, _2)); + options.override_masks()->push_back(std::bind(&override_unkeyworded, env, _1, _2)); else if (*a == "repository") - options.override_masks()->push_back(std::tr1::bind(&override_repository_masks, _2)); + options.override_masks()->push_back(std::bind(&override_repository_masks, _2)); else if (*a == "license") - options.override_masks()->push_back(std::tr1::bind(&override_license, _2)); + options.override_masks()->push_back(std::bind(&override_license, _2)); else if (*a == "none") { } diff --git a/paludis/args/install_args_group.cc b/paludis/args/install_args_group.cc index afb853368..d219ccb79 100644 --- a/paludis/args/install_args_group.cc +++ b/paludis/args/install_args_group.cc @@ -90,19 +90,19 @@ InstallArgsGroup::populate_dep_list_options(const Environment *, DepListOptions options.dependency_tags() = a_show_reasons.argument() == "summary" || a_show_reasons.argument() == "full"; } -std::tr1::shared_ptr<const DestinationsSet> +std::shared_ptr<const DestinationsSet> InstallArgsGroup::destinations(Environment * env) const { if (a_destinations.specified()) { Context local_context("When building destinations collection:"); - std::tr1::shared_ptr<DestinationsSet> d(new DestinationsSet); + std::shared_ptr<DestinationsSet> d(new DestinationsSet); for (args::StringSetArg::ConstIterator i(a_destinations.begin_args()), i_end(a_destinations.end_args()) ; i != i_end ; ++i) { - std::tr1::shared_ptr<Repository> repo(env->package_database()->fetch_repository( + std::shared_ptr<Repository> repo(env->package_database()->fetch_repository( RepositoryName(*i))); if ((*repo).destination_interface()) d->insert(repo); @@ -149,15 +149,15 @@ InstallArgsGroup::populate_install_task(const Environment *, InstallTask & task) else throw args::DoHelp("bad value for --change-phases-for"); - std::tr1::shared_ptr<Set<std::string> > skip_phases(new Set<std::string>); + std::shared_ptr<Set<std::string> > skip_phases(new Set<std::string>); std::copy(a_skip_phase.begin_args(), a_skip_phase.end_args(), skip_phases->inserter()); task.set_skip_phases(skip_phases); - std::tr1::shared_ptr<Set<std::string> > abort_at_phases(new Set<std::string>); + std::shared_ptr<Set<std::string> > abort_at_phases(new Set<std::string>); std::copy(a_abort_at_phase.begin_args(), a_abort_at_phase.end_args(), abort_at_phases->inserter()); task.set_abort_at_phases(abort_at_phases); - std::tr1::shared_ptr<Set<std::string> > skip_until_phases(new Set<std::string>); + std::shared_ptr<Set<std::string> > skip_until_phases(new Set<std::string>); std::copy(a_skip_until_phase.begin_args(), a_skip_until_phase.end_args(), skip_until_phases->inserter()); task.set_skip_until_phases(skip_until_phases); } diff --git a/paludis/args/install_args_group.hh b/paludis/args/install_args_group.hh index 4f392f8cd..22204675c 100644 --- a/paludis/args/install_args_group.hh +++ b/paludis/args/install_args_group.hh @@ -114,7 +114,7 @@ namespace paludis /** * Fetch our specified destinations set. */ - std::tr1::shared_ptr<const DestinationsSet> destinations(Environment *) const; + std::shared_ptr<const DestinationsSet> destinations(Environment *) const; /** * Populate an InstallTask from our values. diff --git a/paludis/args/man.cc b/paludis/args/man.cc index 74103e626..a5266e6fb 100644 --- a/paludis/args/man.cc +++ b/paludis/args/man.cc @@ -20,7 +20,7 @@ #include "man.hh" #include <paludis/util/simple_visitor_cast.hh> #include <paludis/util/wrapped_forward_iterator-impl.hh> -#include <tr1/functional> +#include <functional> #include <ostream> #include <sstream> #include <algorithm> @@ -110,7 +110,7 @@ namespace void paludis::args::generate_doc(DocWriter & dw, const ArgsHandler * const h) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; dw.heading(h->app_name(), h->man_section(), h->app_synopsis()); @@ -173,7 +173,7 @@ paludis::args::generate_doc(DocWriter & dw, const ArgsHandler * const h) if (h->begin_notes() != h->end_notes()) { dw.start_notes(); - std::for_each(h->begin_notes(), h->end_notes(), std::tr1::bind(&DocWriter::note, &dw, _1)); + std::for_each(h->begin_notes(), h->end_notes(), std::bind(&DocWriter::note, &dw, _1)); dw.end_notes(); } diff --git a/paludis/broken_linkage_configuration.cc b/paludis/broken_linkage_configuration.cc index 014b92872..e25de8dfe 100644 --- a/paludis/broken_linkage_configuration.cc +++ b/paludis/broken_linkage_configuration.cc @@ -30,7 +30,6 @@ #include <paludis/util/system.hh> #include <paludis/util/tokeniser.hh> #include <paludis/util/wrapped_forward_iterator-impl.hh> -#include <tr1/functional> #include <algorithm> #include <functional> #include <iterator> @@ -75,7 +74,7 @@ namespace template <typename T_> void - from_colon_string(const std::tr1::function<std::string (const std::string &)> & source, + from_colon_string(const std::function<std::string (const std::string &)> & source, const std::string & varname, std::vector<T_> & vec) { std::string str(source.operator() (varname)); /* silly 4.3 ICE */ @@ -89,7 +88,7 @@ namespace template <typename T_> void - from_string(const std::tr1::function<std::string (const std::string &)> & source, + from_string(const std::function<std::string (const std::string &)> & source, const std::string & varname, std::vector<T_> & vec) { std::string str(source.operator() (varname)); /* silly 4.3 ICE */ @@ -167,12 +166,12 @@ BrokenLinkageConfiguration::~BrokenLinkageConfiguration() void Implementation<BrokenLinkageConfiguration>::load_from_environment() { - using namespace std::tr1::placeholders; + using namespace std::placeholders; Context ctx("When checking environment variables:"); - std::tr1::function<std::string (const std::string &)> fromenv( - std::tr1::bind(getenv_with_default, _1, "")); + std::function<std::string (const std::string &)> fromenv( + std::bind(getenv_with_default, _1, "")); from_string(fromenv, "LD_LIBRARY_MASK", ld_library_mask); from_string(fromenv, "SEARCH_DIRS", search_dirs); @@ -182,7 +181,7 @@ Implementation<BrokenLinkageConfiguration>::load_from_environment() void Implementation<BrokenLinkageConfiguration>::load_from_etc_revdep_rebuild(const FSEntry & root) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; FSEntry etc_revdep_rebuild(root / "etc" / "revdep-rebuild"); Context ctx("When reading '" + stringify(etc_revdep_rebuild) + "':"); @@ -210,8 +209,8 @@ Implementation<BrokenLinkageConfiguration>::load_from_etc_revdep_rebuild(const F KeyValueConfigFile kvs(*it, opts, &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation); - std::tr1::function<std::string (const std::string &)> fromfile( - std::tr1::bind(&KeyValueConfigFile::get, std::tr1::cref(kvs), _1)); + std::function<std::string (const std::string &)> fromfile( + std::bind(&KeyValueConfigFile::get, std::cref(kvs), _1)); from_string(fromfile, "LD_LIBRARY_MASK", ld_library_mask); from_string(fromfile, "SEARCH_DIRS", search_dirs); @@ -230,7 +229,7 @@ Implementation<BrokenLinkageConfiguration>::load_from_etc_revdep_rebuild(const F void Implementation<BrokenLinkageConfiguration>::load_from_etc_profile_env(const FSEntry & root) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; FSEntry etc_profile_env(root / "etc" / "profile.env"); Context ctx("When reading '" + stringify(etc_profile_env) + "':"); @@ -245,8 +244,8 @@ Implementation<BrokenLinkageConfiguration>::load_from_etc_profile_env(const FSEn KeyValueConfigFile kvs(etc_profile_env, opts, &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation); - std::tr1::function<std::string (const std::string &)> fromfile( - std::tr1::bind(&KeyValueConfigFile::get, std::tr1::cref(kvs), _1)); + std::function<std::string (const std::string &)> fromfile( + std::bind(&KeyValueConfigFile::get, std::cref(kvs), _1)); from_colon_string(fromfile, "PATH", search_dirs); from_colon_string(fromfile, "ROOTPATH", search_dirs); diff --git a/paludis/broken_linkage_finder.cc b/paludis/broken_linkage_finder.cc index 6026ed843..c72f5b8de 100644 --- a/paludis/broken_linkage_finder.cc +++ b/paludis/broken_linkage_finder.cc @@ -47,7 +47,7 @@ #include <paludis/selection.hh> #include <paludis/notifier_callback.hh> -#include <tr1/functional> +#include <functional> #include <algorithm> #include <iterator> #include <map> @@ -56,9 +56,9 @@ using namespace paludis; -typedef std::multimap<FSEntry, std::tr1::shared_ptr<const PackageID> > Files; +typedef std::multimap<FSEntry, std::shared_ptr<const PackageID> > Files; typedef std::map<FSEntry, std::set<std::string> > PackageBreakage; -typedef std::map<std::tr1::shared_ptr<const PackageID>, PackageBreakage, PackageIDSetComparator> Breakage; +typedef std::map<std::shared_ptr<const PackageID>, PackageBreakage, PackageIDSetComparator> Breakage; namespace paludis { @@ -69,7 +69,7 @@ namespace paludis const BrokenLinkageConfiguration config; std::string library; - std::vector<std::tr1::shared_ptr<LinkageChecker> > checkers; + std::vector<std::shared_ptr<LinkageChecker> > checkers; std::set<FSEntry> extra_lib_dirs; Mutex mutex; @@ -86,7 +86,7 @@ namespace paludis void check_file(const FSEntry &); void add_breakage(const FSEntry &, const std::string &); - void gather_package(const std::tr1::shared_ptr<const PackageID> &); + void gather_package(const std::shared_ptr<const PackageID> &); Implementation(const Environment * the_env, const std::string & the_library) : env(the_env), @@ -142,18 +142,18 @@ namespace BrokenLinkageFinder::BrokenLinkageFinder(const Environment * env, const std::string & library) : PrivateImplementationPattern<BrokenLinkageFinder>(new Implementation<BrokenLinkageFinder>(env, library)) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; Context ctx("When checking for broken linkage in '" + stringify(env->root()) + "':"); - _imp->checkers.push_back(std::tr1::shared_ptr<LinkageChecker>(new ElfLinkageChecker(env->root(), library))); + _imp->checkers.push_back(std::shared_ptr<LinkageChecker>(new ElfLinkageChecker(env->root(), library))); if (library.empty()) - _imp->checkers.push_back(std::tr1::shared_ptr<LinkageChecker>(new LibtoolLinkageChecker(env->root()))); + _imp->checkers.push_back(std::shared_ptr<LinkageChecker>(new LibtoolLinkageChecker(env->root()))); std::vector<FSEntry> search_dirs_nosyms, search_dirs_pruned; std::transform(_imp->config.begin_search_dirs(), _imp->config.end_search_dirs(), std::back_inserter(search_dirs_nosyms), - std::tr1::bind(realpath_with_current_and_root, _1, FSEntry("/"), env->root())); + std::bind(realpath_with_current_and_root, _1, FSEntry("/"), env->root())); std::sort(search_dirs_nosyms.begin(), search_dirs_nosyms.end()); for (std::vector<FSEntry>::const_iterator it(search_dirs_nosyms.begin()), @@ -168,10 +168,10 @@ BrokenLinkageFinder::BrokenLinkageFinder(const Environment * env, const std::str std::transform(_imp->config.begin_ld_so_conf(), _imp->config.end_ld_so_conf(), std::inserter(_imp->extra_lib_dirs, _imp->extra_lib_dirs.begin()), - std::tr1::bind(realpath_with_current_and_root, _1, FSEntry("/"), env->root())); + std::bind(realpath_with_current_and_root, _1, FSEntry("/"), env->root())); std::for_each(search_dirs_pruned.begin(), search_dirs_pruned.end(), - std::tr1::bind(&Implementation<BrokenLinkageFinder>::search_directory, _imp.get(), _1)); + std::bind(&Implementation<BrokenLinkageFinder>::search_directory, _imp.get(), _1)); for (std::set<FSEntry>::const_iterator it(_imp->extra_lib_dirs.begin()), it_end(_imp->extra_lib_dirs.end()); it_end != it; ++it) @@ -179,13 +179,13 @@ BrokenLinkageFinder::BrokenLinkageFinder(const Environment * env, const std::str Log::get_instance()->message("reconcilio.broken_linkage_finder.config", ll_debug, lc_context) << "Need to check for extra libraries in '" << (env->root() / *it) << "'"; std::for_each(indirect_iterator(_imp->checkers.begin()), indirect_iterator(_imp->checkers.end()), - std::tr1::bind(&LinkageChecker::add_extra_lib_dir, _1, env->root() / *it)); + std::bind(&LinkageChecker::add_extra_lib_dir, _1, env->root() / *it)); } - std::tr1::function<void (const FSEntry &, const std::string &)> callback( - std::tr1::bind(&Implementation<BrokenLinkageFinder>::add_breakage, _imp.get(), _1, _2)); + std::function<void (const FSEntry &, const std::string &)> callback( + std::bind(&Implementation<BrokenLinkageFinder>::add_breakage, _imp.get(), _1, _2)); std::for_each(indirect_iterator(_imp->checkers.begin()), indirect_iterator(_imp->checkers.end()), - std::tr1::bind(&LinkageChecker::need_breakage_added, _1, callback)); + std::bind(&LinkageChecker::need_breakage_added, _1, callback)); _imp->checkers.clear(); } @@ -223,7 +223,7 @@ Implementation<BrokenLinkageFinder>::search_directory(const FSEntry & directory) void Implementation<BrokenLinkageFinder>::walk_directory(const FSEntry & directory) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; FSEntry without_root(directory.strip_leading(env->root())); if (config.dir_is_masked(without_root)) @@ -243,7 +243,7 @@ Implementation<BrokenLinkageFinder>::walk_directory(const FSEntry & directory) try { std::for_each(DirIterator(directory, DirIteratorOptions() + dio_include_dotfiles + dio_inode_sort), DirIterator(), - std::tr1::bind(&Implementation<BrokenLinkageFinder>::check_file, this, _1)); + std::bind(&Implementation<BrokenLinkageFinder>::check_file, this, _1)); } catch (const FSError & ex) { @@ -254,7 +254,7 @@ Implementation<BrokenLinkageFinder>::walk_directory(const FSEntry & directory) void Implementation<BrokenLinkageFinder>::check_file(const FSEntry & file) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; try { @@ -264,7 +264,7 @@ Implementation<BrokenLinkageFinder>::check_file(const FSEntry & file) if (target.is_regular_file()) { std::for_each(indirect_iterator(checkers.begin()), indirect_iterator(checkers.end()), - std::tr1::bind(&LinkageChecker::note_symlink, _1, file, target)); + std::bind(&LinkageChecker::note_symlink, _1, file, target)); } } @@ -277,7 +277,7 @@ Implementation<BrokenLinkageFinder>::check_file(const FSEntry & file) if (indirect_iterator(checkers.end()) == std::find_if(indirect_iterator(checkers.begin()), indirect_iterator(checkers.end()), - std::tr1::bind(&LinkageChecker::check_file, _1, file))) + std::bind(&LinkageChecker::check_file, _1, file))) Log::get_instance()->message("reconcilio.broken_linkage_finder.unrecognised", ll_debug, lc_context) << "'" << file << "' is not a recognised file type"; } @@ -291,7 +291,7 @@ Implementation<BrokenLinkageFinder>::check_file(const FSEntry & file) void Implementation<BrokenLinkageFinder>::add_breakage(const FSEntry & file, const std::string & req) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; if (library.empty() && config.lib_is_masked(req)) return; @@ -302,11 +302,11 @@ Implementation<BrokenLinkageFinder>::add_breakage(const FSEntry & file, const st Context ctx("When building map from files to packages:"); - std::tr1::shared_ptr<const PackageIDSequence> pkgs((*env)[selection::AllVersionsUnsorted( + std::shared_ptr<const PackageIDSequence> pkgs((*env)[selection::AllVersionsUnsorted( generator::All() | filter::InstalledAtRoot(env->root()))]); std::for_each(pkgs->begin(), pkgs->end(), - std::tr1::bind(&Implementation<BrokenLinkageFinder>::gather_package, this, _1)); + std::bind(&Implementation<BrokenLinkageFinder>::gather_package, this, _1)); } FSEntry without_root(file.strip_leading(env->root())); @@ -322,16 +322,16 @@ Implementation<BrokenLinkageFinder>::add_breakage(const FSEntry & file, const st } void -Implementation<BrokenLinkageFinder>::gather_package(const std::tr1::shared_ptr<const PackageID> & pkg) +Implementation<BrokenLinkageFinder>::gather_package(const std::shared_ptr<const PackageID> & pkg) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; Context ctx("When gathering the contents of " + stringify(*pkg) + ":"); - std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > > key(pkg->contents_key()); + std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > > key(pkg->contents_key()); if (! key) return; - std::tr1::shared_ptr<const Contents> contents(key->value()); + std::shared_ptr<const Contents> contents(key->value()); if (! contents) return; @@ -362,7 +362,7 @@ BrokenLinkageFinder::end_broken_packages() const } BrokenLinkageFinder::BrokenFileConstIterator -BrokenLinkageFinder::begin_broken_files(const std::tr1::shared_ptr<const PackageID> & pkg) const +BrokenLinkageFinder::begin_broken_files(const std::shared_ptr<const PackageID> & pkg) const { if (pkg) { @@ -377,7 +377,7 @@ BrokenLinkageFinder::begin_broken_files(const std::tr1::shared_ptr<const Package } BrokenLinkageFinder::BrokenFileConstIterator -BrokenLinkageFinder::end_broken_files(const std::tr1::shared_ptr<const PackageID> & pkg) const +BrokenLinkageFinder::end_broken_files(const std::shared_ptr<const PackageID> & pkg) const { if (pkg) { @@ -393,7 +393,7 @@ BrokenLinkageFinder::end_broken_files(const std::tr1::shared_ptr<const PackageID BrokenLinkageFinder::MissingRequirementConstIterator BrokenLinkageFinder::begin_missing_requirements( - const std::tr1::shared_ptr<const PackageID> & pkg, const FSEntry & file) const + const std::shared_ptr<const PackageID> & pkg, const FSEntry & file) const { if (pkg) { @@ -419,7 +419,7 @@ BrokenLinkageFinder::begin_missing_requirements( BrokenLinkageFinder::MissingRequirementConstIterator BrokenLinkageFinder::end_missing_requirements( - const std::tr1::shared_ptr<const PackageID> & pkg, const FSEntry & file) const + const std::shared_ptr<const PackageID> & pkg, const FSEntry & file) const { if (pkg) { @@ -444,7 +444,7 @@ BrokenLinkageFinder::end_missing_requirements( } template class WrappedForwardIterator<BrokenLinkageFinder::BrokenPackageConstIteratorTag, - const std::tr1::shared_ptr<const paludis::PackageID> >; + const std::shared_ptr<const paludis::PackageID> >; template class WrappedForwardIterator<BrokenLinkageFinder::BrokenFileConstIteratorTag, const paludis::FSEntry>; template class WrappedForwardIterator<BrokenLinkageFinder::MissingRequirementConstIteratorTag, const std::string>; diff --git a/paludis/broken_linkage_finder.hh b/paludis/broken_linkage_finder.hh index 3db28ba44..268a81203 100644 --- a/paludis/broken_linkage_finder.hh +++ b/paludis/broken_linkage_finder.hh @@ -28,7 +28,7 @@ #include <paludis/environment-fwd.hh> #include <paludis/package_id-fwd.hh> -#include <tr1/memory> +#include <memory> namespace paludis { @@ -44,25 +44,25 @@ namespace paludis struct BrokenPackageConstIteratorTag; typedef paludis::WrappedForwardIterator<BrokenPackageConstIteratorTag, - const std::tr1::shared_ptr<const paludis::PackageID> + const std::shared_ptr<const paludis::PackageID> > BrokenPackageConstIterator; BrokenPackageConstIterator begin_broken_packages() const PALUDIS_ATTRIBUTE((warn_unused_result)); BrokenPackageConstIterator end_broken_packages() const PALUDIS_ATTRIBUTE((warn_unused_result)); struct BrokenFileConstIteratorTag; typedef paludis::WrappedForwardIterator<BrokenFileConstIteratorTag, const paludis::FSEntry> BrokenFileConstIterator; - BrokenFileConstIterator begin_broken_files(const std::tr1::shared_ptr<const paludis::PackageID> &) + BrokenFileConstIterator begin_broken_files(const std::shared_ptr<const paludis::PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - BrokenFileConstIterator end_broken_files(const std::tr1::shared_ptr<const paludis::PackageID> &) + BrokenFileConstIterator end_broken_files(const std::shared_ptr<const paludis::PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); struct MissingRequirementConstIteratorTag; typedef paludis::WrappedForwardIterator<MissingRequirementConstIteratorTag, const std::string> MissingRequirementConstIterator; MissingRequirementConstIterator begin_missing_requirements( - const std::tr1::shared_ptr<const paludis::PackageID> &, const paludis::FSEntry &) + const std::shared_ptr<const paludis::PackageID> &, const paludis::FSEntry &) const PALUDIS_ATTRIBUTE((warn_unused_result)); MissingRequirementConstIterator end_missing_requirements( - const std::tr1::shared_ptr<const paludis::PackageID> &, const paludis::FSEntry &) + const std::shared_ptr<const paludis::PackageID> &, const paludis::FSEntry &) const PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/buffer_output_manager.cc b/paludis/buffer_output_manager.cc index 15b739e82..e33464bd1 100644 --- a/paludis/buffer_output_manager.cc +++ b/paludis/buffer_output_manager.cc @@ -32,12 +32,12 @@ namespace paludis template <> struct Implementation<BufferOutputManager> { - const std::tr1::shared_ptr<OutputManager> child; + const std::shared_ptr<OutputManager> child; BufferOutputStream stdout_stream; BufferOutputStream stderr_stream; Implementation( - const std::tr1::shared_ptr<OutputManager> & c) : + const std::shared_ptr<OutputManager> & c) : child(c) { } @@ -45,7 +45,7 @@ namespace paludis } BufferOutputManager::BufferOutputManager( - const std::tr1::shared_ptr<OutputManager> & c) : + const std::shared_ptr<OutputManager> & c) : PrivateImplementationPattern<BufferOutputManager>(new Implementation<BufferOutputManager>(c)) { } @@ -98,15 +98,15 @@ BufferOutputManager::nothing_more_to_come() _imp->child->nothing_more_to_come(); } -const std::tr1::shared_ptr<const Set<std::string> > +const std::shared_ptr<const Set<std::string> > BufferOutputManager::factory_managers() { - std::tr1::shared_ptr<Set<std::string> > result(new Set<std::string>); + std::shared_ptr<Set<std::string> > result(new Set<std::string>); result->insert("buffer"); return result; } -const std::tr1::shared_ptr<OutputManager> +const std::shared_ptr<OutputManager> BufferOutputManager::factory_create( const OutputManagerFactory::KeyFunction & key_func, const OutputManagerFactory::CreateChildFunction & create_child, @@ -115,7 +115,7 @@ BufferOutputManager::factory_create( std::string child_str(key_func("child")); if (child_str.empty()) throw ConfigurationError("No child specified for BufferOutputManager"); - const std::tr1::shared_ptr<OutputManager> child(create_child(child_str)); + const std::shared_ptr<OutputManager> child(create_child(child_str)); return make_shared_ptr(new BufferOutputManager(child)); } diff --git a/paludis/buffer_output_manager.hh b/paludis/buffer_output_manager.hh index c055b2000..325a050bb 100644 --- a/paludis/buffer_output_manager.hh +++ b/paludis/buffer_output_manager.hh @@ -24,8 +24,8 @@ #include <paludis/output_manager.hh> #include <paludis/output_manager_factory.hh> #include <paludis/util/private_implementation_pattern.hh> -#include <tr1/memory> -#include <tr1/functional> +#include <memory> +#include <functional> namespace paludis { @@ -35,7 +35,7 @@ namespace paludis { public: BufferOutputManager( - const std::tr1::shared_ptr<OutputManager> & + const std::shared_ptr<OutputManager> & ); ~BufferOutputManager(); @@ -48,10 +48,10 @@ namespace paludis virtual void nothing_more_to_come(); virtual void message(const MessageType, const std::string &); - static const std::tr1::shared_ptr<const Set<std::string> > factory_managers() + static const std::shared_ptr<const Set<std::string> > factory_managers() PALUDIS_ATTRIBUTE((warn_unused_result)); - static const std::tr1::shared_ptr<OutputManager> factory_create( + static const std::shared_ptr<OutputManager> factory_create( const OutputManagerFactory::KeyFunction &, const OutputManagerFactory::CreateChildFunction &, const OutputManagerFactory::ReplaceVarsFunc &) diff --git a/paludis/choice.cc b/paludis/choice.cc index d818cf366..6e1253c44 100644 --- a/paludis/choice.cc +++ b/paludis/choice.cc @@ -30,8 +30,8 @@ using namespace paludis; -typedef std::list<std::tr1::shared_ptr<const Choice> > ChoicesList; -typedef std::list<std::tr1::shared_ptr<const ChoiceValue> > ChoiceList; +typedef std::list<std::shared_ptr<const Choice> > ChoicesList; +typedef std::list<std::shared_ptr<const ChoiceValue> > ChoiceList; namespace paludis { @@ -168,7 +168,7 @@ Choices::~Choices() } void -Choices::add(const std::tr1::shared_ptr<const Choice> & c) +Choices::add(const std::shared_ptr<const Choice> & c) { _imp->choices.push_back(c); } @@ -195,7 +195,7 @@ Choices::find(const ChoicePrefixName & p) const return end(); } -const std::tr1::shared_ptr<const ChoiceValue> +const std::shared_ptr<const ChoiceValue> Choices::find_by_name_with_prefix(const ChoiceNameWithPrefix & f) const { for (ConstIterator i(begin()), i_end(end()) ; @@ -210,7 +210,7 @@ Choices::find_by_name_with_prefix(const ChoiceNameWithPrefix & f) const return *j; } - return std::tr1::shared_ptr<const ChoiceValue>(); + return std::shared_ptr<const ChoiceValue>(); } bool @@ -254,7 +254,7 @@ Choice::~Choice() } void -Choice::add(const std::tr1::shared_ptr<const ChoiceValue> & v) +Choice::add(const std::shared_ptr<const ChoiceValue> & v) { _imp->values.push_back(v); } @@ -320,8 +320,8 @@ ChoiceValue::~ChoiceValue() template class PrivateImplementationPattern<Choices>; template class PrivateImplementationPattern<Choice>; -template class WrappedForwardIterator<Choices::ConstIteratorTag, const std::tr1::shared_ptr<const Choice> >; -template class WrappedForwardIterator<Choice::ConstIteratorTag, const std::tr1::shared_ptr<const ChoiceValue> >; +template class WrappedForwardIterator<Choices::ConstIteratorTag, const std::shared_ptr<const Choice> >; +template class WrappedForwardIterator<Choice::ConstIteratorTag, const std::shared_ptr<const ChoiceValue> >; template class WrappedValue<UnprefixedChoiceNameTag>; template std::ostream & paludis::operator<< (std::ostream &, const WrappedValue<UnprefixedChoiceNameTag> &); diff --git a/paludis/choice.hh b/paludis/choice.hh index 0ccd566f1..dcaea6275 100644 --- a/paludis/choice.hh +++ b/paludis/choice.hh @@ -27,7 +27,7 @@ #include <paludis/util/exception.hh> #include <paludis/util/named_value.hh> #include <paludis/util/wrapped_value.hh> -#include <tr1/memory> +#include <memory> #include <string> /** \file @@ -152,13 +152,13 @@ namespace paludis /** * Add a new Choice to our collection. */ - void add(const std::tr1::shared_ptr<const Choice> &); + void add(const std::shared_ptr<const Choice> &); ///\name Iterate over Choice children ///\{ struct ConstIteratorTag; - typedef WrappedForwardIterator<ConstIteratorTag, const std::tr1::shared_ptr<const Choice> > ConstIterator; + typedef WrappedForwardIterator<ConstIteratorTag, const std::shared_ptr<const Choice> > ConstIterator; ConstIterator begin() const PALUDIS_ATTRIBUTE((warn_unused_result)); ConstIterator end() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -177,7 +177,7 @@ namespace paludis * to hunt around in all the subkeys manually. Prefixes work too, e.g. "linguas_en" for * 0-based EAPIs or "linguas:en" for exheres EAPIs. */ - const std::tr1::shared_ptr<const ChoiceValue> find_by_name_with_prefix( + const std::shared_ptr<const ChoiceValue> find_by_name_with_prefix( const ChoiceNameWithPrefix &) const PALUDIS_ATTRIBUTE((warn_unused_result)); /** @@ -232,7 +232,7 @@ namespace paludis /** * Add a new ChoiceValue. */ - void add(const std::tr1::shared_ptr<const ChoiceValue> &); + void add(const std::shared_ptr<const ChoiceValue> &); ///\name Properties ///\{ @@ -290,7 +290,7 @@ namespace paludis ///\{ struct ConstIteratorTag; - typedef WrappedForwardIterator<ConstIteratorTag, const std::tr1::shared_ptr<const ChoiceValue> > ConstIterator; + typedef WrappedForwardIterator<ConstIteratorTag, const std::shared_ptr<const ChoiceValue> > ConstIterator; ConstIterator begin() const PALUDIS_ATTRIBUTE((warn_unused_result)); ConstIterator end() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -373,8 +373,8 @@ namespace paludis extern template class PrivateImplementationPattern<Choices>; extern template class PrivateImplementationPattern<Choice>; - extern template class WrappedForwardIterator<Choices::ConstIteratorTag, const std::tr1::shared_ptr<const Choice> >; - extern template class WrappedForwardIterator<Choice::ConstIteratorTag, const std::tr1::shared_ptr<const ChoiceValue> >; + extern template class WrappedForwardIterator<Choices::ConstIteratorTag, const std::shared_ptr<const Choice> >; + extern template class WrappedForwardIterator<Choice::ConstIteratorTag, const std::shared_ptr<const ChoiceValue> >; } #endif diff --git a/paludis/comma_separated_dep_parser.cc b/paludis/comma_separated_dep_parser.cc index d701bd0a8..13486318f 100644 --- a/paludis/comma_separated_dep_parser.cc +++ b/paludis/comma_separated_dep_parser.cc @@ -30,12 +30,12 @@ using namespace paludis; -std::tr1::shared_ptr<const DependencySpecTree> +std::shared_ptr<const DependencySpecTree> CommaSeparatedDepParser::parse(const Environment * const env, const std::string & s) { Context context("When parsing '" + s + "':"); - std::tr1::shared_ptr<DependencySpecTree> result(new DependencySpecTree(make_shared_ptr(new AllDepSpec))); + std::shared_ptr<DependencySpecTree> result(new DependencySpecTree(make_shared_ptr(new AllDepSpec))); std::list<std::string> tokens; tokenise<delim_kind::AnyOfTag, delim_mode::DelimiterTag>(s, ",", "", std::back_inserter(tokens)); @@ -49,7 +49,7 @@ CommaSeparatedDepParser::parse(const Environment * const env, const std::string if (a.empty()) continue; - std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(parse_user_package_dep_spec(a, env, + std::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(parse_user_package_dep_spec(a, env, UserPackageDepSpecOptions() + updso_no_disambiguation))); result->root()->append(spec); } diff --git a/paludis/comma_separated_dep_parser.hh b/paludis/comma_separated_dep_parser.hh index 6e5acd80a..7b0c442e0 100644 --- a/paludis/comma_separated_dep_parser.hh +++ b/paludis/comma_separated_dep_parser.hh @@ -30,7 +30,7 @@ namespace paludis public: CommaSeparatedDepParser() = delete; - static std::tr1::shared_ptr<const DependencySpecTree> parse( + static std::shared_ptr<const DependencySpecTree> parse( const Environment * const env, const std::string &); }; } diff --git a/paludis/comma_separated_dep_parser_TEST.cc b/paludis/comma_separated_dep_parser_TEST.cc index 7d4eb88a4..e4506e7e5 100644 --- a/paludis/comma_separated_dep_parser_TEST.cc +++ b/paludis/comma_separated_dep_parser_TEST.cc @@ -36,7 +36,7 @@ namespace test_cases void run() { TestEnvironment env; - std::tr1::shared_ptr<const DependencySpecTree> spec( + std::shared_ptr<const DependencySpecTree> spec( CommaSeparatedDepParser::parse(&env, "cat/one , cat/two, cat/three\n")); StringifyFormatter f; CommaSeparatedDepPrinter p(&env, f, true); diff --git a/paludis/common_sets.cc b/paludis/common_sets.cc index f14fb7e39..707ae9c5a 100644 --- a/paludis/common_sets.cc +++ b/paludis/common_sets.cc @@ -36,7 +36,7 @@ using namespace paludis; namespace { - std::tr1::shared_ptr<SetSpecTree> get_installed_set( + std::shared_ptr<SetSpecTree> get_installed_set( const Environment * const env, const Repository * const repo, const bool slots) @@ -44,9 +44,9 @@ namespace Context context("When making " + std::string(slots ? "installed-slots" : "installed-packages") + " set from '" + stringify(repo->name()) + "':"); - std::tr1::shared_ptr<SetSpecTree> result(new SetSpecTree(make_shared_ptr(new AllDepSpec))); + std::shared_ptr<SetSpecTree> result(new SetSpecTree(make_shared_ptr(new AllDepSpec))); - std::tr1::shared_ptr<const PackageIDSequence> ids; + std::shared_ptr<const PackageIDSequence> ids; if (slots) ids = ((*env)[selection::BestVersionInEachSlot(generator::InRepository(repo->name()))]); else @@ -77,8 +77,8 @@ paludis::add_common_sets_for_installed_repo( const Repository & repo) { env->add_set(SetName("installed-packages"), SetName("installed-packages::" + stringify(repo.name())), - std::tr1::bind(&get_installed_set, env, &repo, false), true); + std::bind(&get_installed_set, env, &repo, false), true); env->add_set(SetName("installed-slots"), SetName("installed-slots::" + stringify(repo.name())), - std::tr1::bind(&get_installed_set, env, &repo, true), true); + std::bind(&get_installed_set, env, &repo, true), true); } diff --git a/paludis/contents.cc b/paludis/contents.cc index 302ffde5c..67a963cd2 100644 --- a/paludis/contents.cc +++ b/paludis/contents.cc @@ -25,14 +25,14 @@ using namespace paludis; -typedef std::list<std::tr1::shared_ptr<const ContentsEntry> > Entries; +typedef std::list<std::shared_ptr<const ContentsEntry> > Entries; namespace paludis { template <> struct Implementation<ContentsEntry> { - const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key; + const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key; Implementation(const FSEntry & n) : location_key(make_shared_ptr(new LiteralMetadataValueKey<FSEntry>("location", "location", mkt_significant, n))) @@ -57,7 +57,7 @@ ContentsEntry::need_keys_added() const { } -const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > +const std::shared_ptr<const MetadataValueKey<FSEntry> > ContentsEntry::location_key() const { return _imp->location_key; @@ -83,7 +83,7 @@ namespace paludis template <> struct Implementation<ContentsSymEntry> { - const std::tr1::shared_ptr<const MetadataValueKey<std::string> > target_key; + const std::shared_ptr<const MetadataValueKey<std::string> > target_key; Implementation(const std::string & t) : target_key(make_shared_ptr(new LiteralMetadataValueKey<std::string>("target", "target", mkt_normal, t))) @@ -104,7 +104,7 @@ ContentsSymEntry::~ContentsSymEntry() { } -const std::tr1::shared_ptr<const MetadataValueKey<std::string> > +const std::shared_ptr<const MetadataValueKey<std::string> > ContentsSymEntry::target_key() const { return _imp->target_key; @@ -135,7 +135,7 @@ Contents::~Contents() } void -Contents::add(const std::tr1::shared_ptr<const ContentsEntry> & c) +Contents::add(const std::shared_ptr<const ContentsEntry> & c) { _imp->c.push_back(c); } @@ -156,5 +156,5 @@ template class PrivateImplementationPattern<Contents>; template class PrivateImplementationPattern<ContentsEntry>; template class PrivateImplementationPattern<ContentsSymEntry>; -template class WrappedForwardIterator<Contents::ConstIteratorTag, const std::tr1::shared_ptr<const ContentsEntry> >; +template class WrappedForwardIterator<Contents::ConstIteratorTag, const std::shared_ptr<const ContentsEntry> >; diff --git a/paludis/contents.hh b/paludis/contents.hh index ef0878eeb..8213b8e76 100644 --- a/paludis/contents.hh +++ b/paludis/contents.hh @@ -27,7 +27,7 @@ #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/fs_entry-fwd.hh> #include <paludis/metadata_key_holder.hh> -#include <tr1/memory> +#include <memory> #include <string> /** \file @@ -91,7 +91,7 @@ namespace paludis * * \since 0.36 */ - const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const; + const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const; ///\} @@ -187,7 +187,7 @@ namespace paludis * * \since 0.36 */ - const std::tr1::shared_ptr<const MetadataValueKey<std::string> > target_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > target_key() const; ///\} }; @@ -214,13 +214,13 @@ namespace paludis ///\} /// Add a new entry. - void add(const std::tr1::shared_ptr<const ContentsEntry> & c); + void add(const std::shared_ptr<const ContentsEntry> & c); ///\name Iterate over our entries ///\{ struct ConstIteratorTag; - typedef WrappedForwardIterator<ConstIteratorTag, const std::tr1::shared_ptr<const ContentsEntry> > ConstIterator; + typedef WrappedForwardIterator<ConstIteratorTag, const std::shared_ptr<const ContentsEntry> > ConstIterator; ConstIterator begin() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -235,7 +235,7 @@ namespace paludis extern template class PrivateImplementationPattern<ContentsEntry>; extern template class PrivateImplementationPattern<ContentsSymEntry>; - extern template class WrappedForwardIterator<Contents::ConstIteratorTag, const std::tr1::shared_ptr<const ContentsEntry> >; + extern template class WrappedForwardIterator<Contents::ConstIteratorTag, const std::shared_ptr<const ContentsEntry> >; } #endif diff --git a/paludis/create_output_manager_info.cc b/paludis/create_output_manager_info.cc index b768e2e3e..093231750 100644 --- a/paludis/create_output_manager_info.cc +++ b/paludis/create_output_manager_info.cc @@ -36,48 +36,48 @@ namespace { struct GetFlagsVisitor { - std::tr1::shared_ptr<Set<std::string> > visit(const InstallAction &) const + std::shared_ptr<Set<std::string> > visit(const InstallAction &) const { return make_shared_ptr(new Set<std::string>); } - std::tr1::shared_ptr<Set<std::string> > visit(const UninstallAction &) const + std::shared_ptr<Set<std::string> > visit(const UninstallAction &) const { return make_shared_ptr(new Set<std::string>); } - std::tr1::shared_ptr<Set<std::string> > visit(const PretendAction &) const + std::shared_ptr<Set<std::string> > visit(const PretendAction &) const { return make_shared_ptr(new Set<std::string>); } - std::tr1::shared_ptr<Set<std::string> > visit(const FetchAction & a) const + std::shared_ptr<Set<std::string> > visit(const FetchAction & a) const { - std::tr1::shared_ptr<Set<std::string> > result(new Set<std::string>); + std::shared_ptr<Set<std::string> > result(new Set<std::string>); if (a.options.ignore_unfetched()) result->insert(FetchAction::ignore_unfetched_flag_name()); return result; } - std::tr1::shared_ptr<Set<std::string> > visit(const PretendFetchAction &) const + std::shared_ptr<Set<std::string> > visit(const PretendFetchAction &) const { return make_shared_ptr(new Set<std::string>); } - std::tr1::shared_ptr<Set<std::string> > visit(const ConfigAction &) const + std::shared_ptr<Set<std::string> > visit(const ConfigAction &) const { return make_shared_ptr(new Set<std::string>); } - std::tr1::shared_ptr<Set<std::string> > visit(const InfoAction &) const + std::shared_ptr<Set<std::string> > visit(const InfoAction &) const { return make_shared_ptr(new Set<std::string>); } }; - std::tr1::shared_ptr<Set<std::string> > get_flags(const Action & a) + std::shared_ptr<Set<std::string> > get_flags(const Action & a) { - return a.accept_returning<std::tr1::shared_ptr<Set<std::string> > >(GetFlagsVisitor()); + return a.accept_returning<std::shared_ptr<Set<std::string> > >(GetFlagsVisitor()); } } @@ -86,15 +86,15 @@ namespace paludis template <> struct Implementation<CreateOutputManagerForPackageIDActionInfo> { - const std::tr1::shared_ptr<const PackageID> id; + const std::shared_ptr<const PackageID> id; const std::string action_name; - const std::tr1::shared_ptr<const Set<std::string> > action_flags; + const std::shared_ptr<const Set<std::string> > action_flags; const OutputExclusivity output_exclusivity; const ClientOutputFeatures client_output_features; - Implementation(const std::tr1::shared_ptr<const PackageID> & i, + Implementation(const std::shared_ptr<const PackageID> & i, const std::string & a, - const std::tr1::shared_ptr<const Set<std::string> > & f, + const std::shared_ptr<const Set<std::string> > & f, const OutputExclusivity e, const ClientOutputFeatures & c) : id(i), @@ -122,7 +122,7 @@ namespace paludis }; } -const std::tr1::shared_ptr<CreateOutputManagerInfo> +const std::shared_ptr<CreateOutputManagerInfo> CreateOutputManagerInfo::deserialise(Deserialisation & d) { if (d.class_name() == "CreateOutputManagerForPackageIDActionInfo") @@ -134,7 +134,7 @@ CreateOutputManagerInfo::deserialise(Deserialisation & d) } CreateOutputManagerForPackageIDActionInfo::CreateOutputManagerForPackageIDActionInfo( - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const Action & a, const OutputExclusivity e, const ClientOutputFeatures & c) : @@ -145,9 +145,9 @@ CreateOutputManagerForPackageIDActionInfo::CreateOutputManagerForPackageIDAction } CreateOutputManagerForPackageIDActionInfo::CreateOutputManagerForPackageIDActionInfo( - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const std::string & a, - const std::tr1::shared_ptr<const Set<std::string> > & f, + const std::shared_ptr<const Set<std::string> > & f, const OutputExclusivity e, const ClientOutputFeatures & c) : PrivateImplementationPattern<CreateOutputManagerForPackageIDActionInfo>( @@ -159,7 +159,7 @@ CreateOutputManagerForPackageIDActionInfo::~CreateOutputManagerForPackageIDActio { } -const std::tr1::shared_ptr<const PackageID> +const std::shared_ptr<const PackageID> CreateOutputManagerForPackageIDActionInfo::package_id() const { return _imp->id; @@ -171,7 +171,7 @@ CreateOutputManagerForPackageIDActionInfo::action_name() const return _imp->action_name; } -const std::tr1::shared_ptr<const Set<std::string> > +const std::shared_ptr<const Set<std::string> > CreateOutputManagerForPackageIDActionInfo::action_flags() const { return _imp->action_flags; @@ -201,18 +201,18 @@ CreateOutputManagerForPackageIDActionInfo::serialise(Serialiser & s) const ; } -const std::tr1::shared_ptr<CreateOutputManagerForPackageIDActionInfo> +const std::shared_ptr<CreateOutputManagerForPackageIDActionInfo> CreateOutputManagerForPackageIDActionInfo::deserialise(Deserialisation & d) { Deserialisator v(d, "CreateOutputManagerForPackageIDActionInfo"); - std::tr1::shared_ptr<Set<std::string> > action_flags(new Set<std::string>); + std::shared_ptr<Set<std::string> > action_flags(new Set<std::string>); Deserialisator vv(*v.find_remove_member("action_flags"), "c"); for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n) action_flags->insert(vv.member<std::string>(stringify(n))); return make_shared_ptr(new CreateOutputManagerForPackageIDActionInfo( - v.member<std::tr1::shared_ptr<const PackageID> >("package_id"), + v.member<std::shared_ptr<const PackageID> >("package_id"), v.member<std::string>("action_name"), action_flags, destringify<OutputExclusivity>(v.member<std::string>("output_exclusivity")), @@ -259,7 +259,7 @@ CreateOutputManagerForRepositorySyncInfo::serialise(Serialiser & s) const ; } -const std::tr1::shared_ptr<CreateOutputManagerForRepositorySyncInfo> +const std::shared_ptr<CreateOutputManagerForRepositorySyncInfo> CreateOutputManagerForRepositorySyncInfo::deserialise(Deserialisation & d) { Deserialisator v(d, "CreateOutputManagerForRepositorySyncInfo"); diff --git a/paludis/create_output_manager_info.hh b/paludis/create_output_manager_info.hh index 15920088f..82753c96b 100644 --- a/paludis/create_output_manager_info.hh +++ b/paludis/create_output_manager_info.hh @@ -47,7 +47,7 @@ namespace paludis >::Type> { public: - static const std::tr1::shared_ptr<CreateOutputManagerInfo> deserialise( + static const std::shared_ptr<CreateOutputManagerInfo> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); virtual void serialise(Serialiser &) const = 0; @@ -71,9 +71,9 @@ namespace paludis * \since 0.46 */ CreateOutputManagerForPackageIDActionInfo( - const std::tr1::shared_ptr<const PackageID> & id, + const std::shared_ptr<const PackageID> & id, const std::string & action_name, - const std::tr1::shared_ptr<const Set<std::string> > & action_flags, + const std::shared_ptr<const Set<std::string> > & action_flags, const OutputExclusivity output_exclusivity, const ClientOutputFeatures & output_features); @@ -81,14 +81,14 @@ namespace paludis * \since 0.46 */ CreateOutputManagerForPackageIDActionInfo( - const std::tr1::shared_ptr<const PackageID> & id, + const std::shared_ptr<const PackageID> & id, const Action &, const OutputExclusivity output_exclusivity, const ClientOutputFeatures & output_features); ~CreateOutputManagerForPackageIDActionInfo(); - const std::tr1::shared_ptr<const PackageID> package_id() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PackageID> package_id() const PALUDIS_ATTRIBUTE((warn_unused_result)); /** * \since 0.44 @@ -98,7 +98,7 @@ namespace paludis /** * \since 0.44 */ - const std::tr1::shared_ptr<const Set<std::string> > action_flags() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > action_flags() const PALUDIS_ATTRIBUTE((warn_unused_result)); OutputExclusivity output_exclusivity() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -109,7 +109,7 @@ namespace paludis virtual void serialise(Serialiser &) const; - static const std::tr1::shared_ptr<CreateOutputManagerForPackageIDActionInfo> deserialise( + static const std::shared_ptr<CreateOutputManagerForPackageIDActionInfo> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -151,7 +151,7 @@ namespace paludis virtual void serialise(Serialiser &) const; - static const std::tr1::shared_ptr<CreateOutputManagerForRepositorySyncInfo> deserialise( + static const std::shared_ptr<CreateOutputManagerForRepositorySyncInfo> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/dep_label-fwd.hh b/paludis/dep_label-fwd.hh index 56bdd4d71..cc97757a1 100644 --- a/paludis/dep_label-fwd.hh +++ b/paludis/dep_label-fwd.hh @@ -22,7 +22,7 @@ #include <paludis/util/attributes.hh> #include <paludis/util/sequence-fwd.hh> -#include <tr1/memory> +#include <memory> #include <iosfwd> /** \file @@ -218,7 +218,7 @@ namespace paludis * \ingroup g_dep_spec * \since 0.42 */ - typedef Sequence<std::tr1::shared_ptr<const DependenciesLabel> > DependenciesLabelSequence; + typedef Sequence<std::shared_ptr<const DependenciesLabel> > DependenciesLabelSequence; /** * A DependenciesLabel can be written to a stream. diff --git a/paludis/dep_label.cc b/paludis/dep_label.cc index a475be76f..2a3460fb7 100644 --- a/paludis/dep_label.cc +++ b/paludis/dep_label.cc @@ -73,7 +73,7 @@ DependenciesLabel::~DependenciesLabel() template <typename T_> ConcreteDependenciesLabel<T_>::ConcreteDependenciesLabel(const std::string & t, - const std::tr1::function<bool ()> & e) : + const std::function<bool ()> & e) : _text(t), _enabled(e) { @@ -115,10 +115,10 @@ template class ConcreteDependenciesLabel<DependenciesSuggestionLabelTag>; template class ConcreteDependenciesLabel<DependenciesRecommendationLabelTag>; template class ConcreteDependenciesLabel<DependenciesTestLabelTag>; -template class Sequence<std::tr1::shared_ptr<const DependenciesLabel> >; -template class WrappedForwardIterator<Sequence<std::tr1::shared_ptr<const DependenciesLabel> >::ConstIteratorTag, - const std::tr1::shared_ptr<const DependenciesLabel> >; -template class WrappedOutputIterator<Sequence<std::tr1::shared_ptr<const DependenciesLabel> >::InserterTag, - std::tr1::shared_ptr<const DependenciesLabel> >; +template class Sequence<std::shared_ptr<const DependenciesLabel> >; +template class WrappedForwardIterator<Sequence<std::shared_ptr<const DependenciesLabel> >::ConstIteratorTag, + const std::shared_ptr<const DependenciesLabel> >; +template class WrappedOutputIterator<Sequence<std::shared_ptr<const DependenciesLabel> >::InserterTag, + std::shared_ptr<const DependenciesLabel> >; diff --git a/paludis/dep_label.hh b/paludis/dep_label.hh index c4bc210e9..8e3b0fda5 100644 --- a/paludis/dep_label.hh +++ b/paludis/dep_label.hh @@ -28,7 +28,7 @@ #include <paludis/util/type_list.hh> #include <paludis/util/sequence.hh> #include <paludis/util/wrapped_forward_iterator.hh> -#include <tr1/functional> +#include <functional> /** \file * Declarations for dependency label-related classes. @@ -146,13 +146,13 @@ namespace paludis { private: const std::string _text; - const std::tr1::function<bool ()> _enabled; + const std::function<bool ()> _enabled; public: ///\name Basic operations ///\{ - ConcreteDependenciesLabel(const std::string &, const std::tr1::function<bool ()> &); + ConcreteDependenciesLabel(const std::string &, const std::function<bool ()> &); ~ConcreteDependenciesLabel(); ///\} @@ -181,8 +181,8 @@ namespace paludis extern template class ConcreteDependenciesLabel<DependenciesRecommendationLabelTag>; extern template class ConcreteDependenciesLabel<DependenciesTestLabelTag>; - extern template class WrappedForwardIterator<Sequence<std::tr1::shared_ptr<const DependenciesLabel> >::ConstIteratorTag, - const std::tr1::shared_ptr<const DependenciesLabel> >; + extern template class WrappedForwardIterator<Sequence<std::shared_ptr<const DependenciesLabel> >::ConstIteratorTag, + const std::shared_ptr<const DependenciesLabel> >; } #endif diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc index a31ceb87b..fce847b7f 100644 --- a/paludis/dep_list.cc +++ b/paludis/dep_list.cc @@ -67,12 +67,11 @@ #include <vector> #include <list> #include <set> -#include <tr1/functional> -#include <tr1/unordered_map> +#include <unordered_map> using namespace paludis; -typedef std::list<std::tr1::shared_ptr<DependenciesLabelSequence> > LabelsStack; +typedef std::list<std::shared_ptr<DependenciesLabelSequence> > LabelsStack; DepListOptions::DepListOptions() : blocks(dl_blocks_accumulate), @@ -103,13 +102,13 @@ DepListOptions::DepListOptions() : namespace paludis { typedef std::list<DepListEntry> MergeList; - typedef std::tr1::unordered_multimap<QualifiedPackageName, MergeList::iterator, Hash<QualifiedPackageName> > MergeListIndex; + typedef std::unordered_multimap<QualifiedPackageName, MergeList::iterator, Hash<QualifiedPackageName> > MergeListIndex; template<> struct Implementation<DepList> { const Environment * const env; - std::tr1::shared_ptr<DepListOptions> opts; + std::shared_ptr<DepListOptions> opts; MergeList merge_list; MergeList::const_iterator current_merge_list_entry; @@ -124,11 +123,11 @@ namespace paludis LabelsStack labels; - const std::tr1::shared_ptr<const PackageID> current_package_id() const + const std::shared_ptr<const PackageID> current_package_id() const { if (current_merge_list_entry != merge_list.end()) return current_merge_list_entry->package_id(); - return std::tr1::shared_ptr<const PackageID>(); + return std::shared_ptr<const PackageID>(); } Implementation(const Environment * const e, const DepListOptions & o) : @@ -191,7 +190,7 @@ namespace /* see EffSTL 9 for why this is so painful */ if (e.tags()->empty()) return; - std::tr1::shared_ptr<DepListEntryTags> t(new DepListEntryTags); + std::shared_ptr<DepListEntryTags> t(new DepListEntryTags); GenerationGreaterThan pred(g); for (DepListEntryTags::ConstIterator i(e.tags()->begin()), i_end(e.tags()->end()) ; i != i_end ; ++i) @@ -311,11 +310,11 @@ namespace struct DepList::AddVisitor { DepList * const d; - std::tr1::shared_ptr<const DestinationsSet> destinations; + std::shared_ptr<const DestinationsSet> destinations; std::set<SetName> recursing_sets; const bool only_if_not_suggested_label; - AddVisitor(DepList * const dd, bool l, std::tr1::shared_ptr<const DestinationsSet> ddd) : + AddVisitor(DepList * const dd, bool l, std::shared_ptr<const DestinationsSet> ddd) : d(dd), destinations(ddd), only_if_not_suggested_label(l) @@ -381,7 +380,7 @@ namespace } }; - bool is_suggest_label(const std::tr1::shared_ptr<const DependenciesLabel> & l) + bool is_suggest_label(const std::shared_ptr<const DependenciesLabel> & l) { return l->accept_returning<bool>(SuggestActiveVisitor()); } @@ -396,7 +395,7 @@ namespace return ! b.slot_key(); } - std::string slot_as_human_string(const std::tr1::shared_ptr<const PackageID> & id) + std::string slot_as_human_string(const std::shared_ptr<const PackageID> & id) { if (! id->slot_key()) return "(no slot)"; @@ -424,7 +423,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<PackageDepSpec>::T /* find already installed things */ // TODO: check destinations - std::tr1::shared_ptr<const PackageIDSequence> already_installed((*d->_imp->env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> already_installed((*d->_imp->env)[selection::AllVersionsSorted( generator::Matches(*node.spec(), d->_imp->opts->match_package_options()) | filter::InstalledAtRoot(d->_imp->env->root()))]); @@ -451,7 +450,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<PackageDepSpec>::T if (d->_imp->opts->dependency_tags() && d->_imp->current_package_id()) existing_merge_list_entry->tags()->insert(make_named_values<DepTagEntry>( n::generation() = d->_imp->merge_list_generation, - n::tag() = std::tr1::shared_ptr<DepTag>(new DependencyDepTag(d->_imp->current_package_id(), *node.spec())) + n::tag() = std::shared_ptr<DepTag>(new DependencyDepTag(d->_imp->current_package_id(), *node.spec())) )); /* add an appropriate destination */ @@ -482,8 +481,8 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<PackageDepSpec>::T } /* find installable candidates, and find the best visible candidate */ - std::tr1::shared_ptr<const PackageID> best_visible_candidate; - std::tr1::shared_ptr<const PackageIDSequence> installable_candidates( + std::shared_ptr<const PackageID> best_visible_candidate; + std::shared_ptr<const PackageIDSequence> installable_candidates( (*d->_imp->env)[selection::AllVersionsSorted(generator::Matches(*node.spec(), d->_imp->opts->match_package_options()) & generator::SomeIDsMightSupportAction<InstallAction>())]); @@ -584,7 +583,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<PackageDepSpec>::T if (! node.spec()->additional_requirements_ptr()) throw AllMaskedError(*node.spec()); - std::tr1::shared_ptr<const PackageIDSequence> match_except_reqs((*d->_imp->env)[selection::AllVersionsSorted( + std::shared_ptr<const PackageIDSequence> match_except_reqs((*d->_imp->env)[selection::AllVersionsSorted( generator::Matches(*node.spec(), d->_imp->opts->match_package_options() + mpo_ignore_additional_requirements))]); for (PackageIDSequence::ReverseConstIterator i(match_except_reqs->rbegin()), @@ -603,7 +602,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<PackageDepSpec>::T } } - std::tr1::shared_ptr<PackageIDSequence> already_installed_in_same_slot(new PackageIDSequence); + std::shared_ptr<PackageIDSequence> already_installed_in_same_slot(new PackageIDSequence); for (PackageIDSequence::ConstIterator aa(already_installed->begin()), aa_end(already_installed->end()) ; aa != aa_end ; ++aa) if (slot_is_same(**aa, *best_visible_candidate)) @@ -658,7 +657,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<PackageDepSpec>::T case dl_downgrade_error: case dl_downgrade_warning: { - std::tr1::shared_ptr<const PackageIDSequence> are_we_downgrading( + std::shared_ptr<const PackageIDSequence> are_we_downgrading( (*d->_imp->env)[selection::AllVersionsSorted( generator::Package(best_visible_candidate->name()) | filter::InstalledAtRoot(d->_imp->env->root()) | @@ -691,7 +690,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<NamedSetDepSpec>:: { Context context("When adding NamedSetDepSpec '" + stringify(*node.spec()) + "':"); - std::tr1::shared_ptr<const SetSpecTree> set(d->_imp->env->set(node.spec()->name())); + std::shared_ptr<const SetSpecTree> set(d->_imp->env->set(node.spec()->name())); if (! set) throw NoSuchSetError(stringify(node.spec()->name())); @@ -711,7 +710,7 @@ void DepList::AddVisitor::visit(const DependencySpecTree::NodeType<AllDepSpec>::Type & node) { d->_imp->labels.push_front(*d->_imp->labels.begin()); - RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &d->_imp->labels)); + RunOnDestruction restore_labels(std::bind(std::mem_fn(&LabelsStack::pop_front), &d->_imp->labels)); std::for_each(indirect_iterator(node.begin()), indirect_iterator(node.end()), accept_visitor(*this)); @@ -723,7 +722,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<ConditionalDepSpec if (d->_imp->opts->use() == dl_use_deps_standard) { d->_imp->labels.push_front(*d->_imp->labels.begin()); - RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &d->_imp->labels)); + RunOnDestruction restore_labels(std::bind(std::mem_fn(&LabelsStack::pop_front), &d->_imp->labels)); if (node.spec()->condition_met()) std::for_each(indirect_iterator(node.begin()), indirect_iterator(node.end()), @@ -740,10 +739,10 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<ConditionalDepSpec void DepList::AddVisitor::visit(const DependencySpecTree::NodeType<AnyDepSpec>::Type & node) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; d->_imp->labels.push_front(*d->_imp->labels.begin()); - RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &d->_imp->labels)); + RunOnDestruction restore_labels(std::bind(std::mem_fn(&LabelsStack::pop_front), &d->_imp->labels)); /* annoying requirement: || ( foo? ( ... ) ) resolves to empty if !foo. */ if (indirect_iterator(node.end()) == std::find_if(indirect_iterator(node.begin()), indirect_iterator(node.end()), &is_viable_any_child)) @@ -752,7 +751,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<AnyDepSpec>::Type { RangeRewriter r; std::for_each(indirect_iterator(node.begin()), indirect_iterator(node.end()), accept_visitor(r)); - std::tr1::shared_ptr<PackageDepSpec> rewritten_spec(r.spec()); + std::shared_ptr<PackageDepSpec> rewritten_spec(r.spec()); if (rewritten_spec) { DependencySpecTree::NodeType<PackageDepSpec>::Type rr(r.spec()); @@ -799,8 +798,8 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<AnyDepSpec>::Type Save<bool> save_t(&d->_imp->throw_on_blocker, dl_blocks_discard_completely != d->_imp->opts->blocks()); - Save<std::tr1::shared_ptr<DepListOverrideMasksFunctions> > save_o(&d->_imp->opts->override_masks(), - std::tr1::shared_ptr<DepListOverrideMasksFunctions>()); + Save<std::shared_ptr<DepListOverrideMasksFunctions> > save_o(&d->_imp->opts->override_masks(), + std::shared_ptr<DepListOverrideMasksFunctions>()); d->add_not_top_level(only_if_not_suggested_label, **c, destinations); return; } @@ -822,8 +821,8 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<AnyDepSpec>::Type Save<bool> save_t(&d->_imp->throw_on_blocker, dl_blocks_discard_completely != d->_imp->opts->blocks()); - Save<std::tr1::shared_ptr<DepListOverrideMasksFunctions> > save_o(&d->_imp->opts->override_masks(), - std::tr1::shared_ptr<DepListOverrideMasksFunctions>()); + Save<std::shared_ptr<DepListOverrideMasksFunctions> > save_o(&d->_imp->opts->override_masks(), + std::shared_ptr<DepListOverrideMasksFunctions>()); d->add_not_top_level(only_if_not_suggested_label, **c, destinations); return; } @@ -860,7 +859,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<BlockDepSpec>::Typ bool check_whole_list(false); std::list<MergeList::const_iterator> will_be_installed; - std::tr1::shared_ptr<const PackageIDSequence> already_installed; + std::shared_ptr<const PackageIDSequence> already_installed; if (node.spec()->blocking().package_ptr()) { @@ -1047,7 +1046,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<BlockDepSpec>::Typ void DepList::AddVisitor::visit(const DependencySpecTree::NodeType<DependenciesLabelsDepSpec>::Type & node) { - std::tr1::shared_ptr<DependenciesLabelSequence> labels(new DependenciesLabelSequence); + std::shared_ptr<DependenciesLabelSequence> labels(new DependenciesLabelSequence); std::copy(node.spec()->begin(), node.spec()->end(), labels->back_inserter()); *d->_imp->labels.begin() = labels; } @@ -1061,13 +1060,13 @@ DepList::~DepList() { } -std::tr1::shared_ptr<DepListOptions> +std::shared_ptr<DepListOptions> DepList::options() { return _imp->opts; } -const std::tr1::shared_ptr<const DepListOptions> +const std::shared_ptr<const DepListOptions> DepList::options() const { return _imp->opts; @@ -1082,7 +1081,7 @@ DepList::clear() void DepList::add_in_role(const bool only_if_not_suggested_label, const DependencySpecTree::BasicNode & spec, const std::string & role, - const std::tr1::shared_ptr<const DestinationsSet> & destinations) + const std::shared_ptr<const DestinationsSet> & destinations) { Context context("When adding " + role + (only_if_not_suggested_label ? " unless under a suggested label" : "") + ":"); add_not_top_level(only_if_not_suggested_label, spec, destinations); @@ -1090,7 +1089,7 @@ DepList::add_in_role(const bool only_if_not_suggested_label, const DependencySpe void DepList::add_not_top_level(const bool only_if_not_suggested_label, - const DependencySpecTree::BasicNode & spec, const std::tr1::shared_ptr<const DestinationsSet> & destinations) + const DependencySpecTree::BasicNode & spec, const std::shared_ptr<const DestinationsSet> & destinations) { DepListTransaction transaction(_imp->merge_list, _imp->merge_list_index, _imp->merge_list_generation); @@ -1100,7 +1099,7 @@ DepList::add_not_top_level(const bool only_if_not_suggested_label, } void -DepList::add(const SetSpecTree & spec, const std::tr1::shared_ptr<const DestinationsSet> & destinations) +DepList::add(const SetSpecTree & spec, const std::shared_ptr<const DestinationsSet> & destinations) { DepListTransaction transaction(_imp->merge_list, _imp->merge_list_index, _imp->merge_list_generation); @@ -1113,7 +1112,7 @@ DepList::add(const SetSpecTree & spec, const std::tr1::shared_ptr<const Destinat } void -DepList::add(const PackageDepSpec & spec, const std::tr1::shared_ptr<const DestinationsSet> & destinations) +DepList::add(const PackageDepSpec & spec, const std::shared_ptr<const DestinationsSet> & destinations) { SetSpecTree tree(make_shared_ptr(new AllDepSpec)); tree.root()->append(make_shared_ptr(new PackageDepSpec(spec))); @@ -1121,8 +1120,8 @@ DepList::add(const PackageDepSpec & spec, const std::tr1::shared_ptr<const Desti } void -DepList::add_package(const std::tr1::shared_ptr<const PackageID> & p, const std::tr1::shared_ptr<const DepTag> & tag, - const PackageDepSpec & pds, const std::tr1::shared_ptr<const DestinationsSet> & destinations) +DepList::add_package(const std::shared_ptr<const PackageID> & p, const std::shared_ptr<const DepTag> & tag, + const PackageDepSpec & pds, const std::shared_ptr<const DestinationsSet> & destinations) { Context context("When adding package '" + stringify(*p) + "':"); _imp->env->trigger_notifier_callback(NotifierCallbackResolverStepEvent()); @@ -1136,15 +1135,15 @@ DepList::add_package(const std::tr1::shared_ptr<const PackageID> & p, const std: _imp->merge_list.insert(_imp->merge_list_insert_position, make_named_values<DepListEntry>( n::associated_entry() = static_cast<DepListEntry *>(0), - n::destination() = p->virtual_for_key() ? std::tr1::shared_ptr<Repository>() : find_destination(*p, destinations), + n::destination() = p->virtual_for_key() ? std::shared_ptr<Repository>() : find_destination(*p, destinations), n::generation() = _imp->merge_list_generation, n::handled() = p->virtual_for_key() ? - std::tr1::shared_ptr<DepListEntryHandled>(new DepListEntryNoHandlingRequired) : - std::tr1::shared_ptr<DepListEntryHandled>(new DepListEntryUnhandled), + std::shared_ptr<DepListEntryHandled>(new DepListEntryNoHandlingRequired) : + std::shared_ptr<DepListEntryHandled>(new DepListEntryUnhandled), n::kind() = p->virtual_for_key() ? dlk_virtual : dlk_package, n::package_id() = p, n::state() = dle_no_deps, - n::tags() = std::tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags) + n::tags() = std::shared_ptr<DepListEntryTags>(new DepListEntryTags) ))), our_merge_entry_post_position(our_merge_entry_position); @@ -1159,7 +1158,7 @@ DepList::add_package(const std::tr1::shared_ptr<const PackageID> & p, const std: if (_imp->opts->dependency_tags() && _imp->current_package_id()) our_merge_entry_position->tags()->insert(make_named_values<DepTagEntry>( n::generation() = _imp->merge_list_generation, - n::tag() = std::tr1::shared_ptr<DepTag>(new DependencyDepTag(_imp->current_package_id(), pds)) + n::tag() = std::shared_ptr<DepTag>(new DependencyDepTag(_imp->current_package_id(), pds)) )); Save<MergeList::const_iterator> save_current_merge_list_entry(&_imp->current_merge_list_entry, @@ -1180,7 +1179,7 @@ DepList::add_package(const std::tr1::shared_ptr<const PackageID> & p, const std: for (DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIterator i(f.begin()), i_end(f.end()) ; i != i_end ; ++i) { - std::tr1::shared_ptr<PackageDepSpec> pp(new PackageDepSpec(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()) + std::shared_ptr<PackageDepSpec> pp(new PackageDepSpec(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()) .package(*(*i)->package_ptr()) .version_requirement(make_named_values<VersionRequirement>( n::version_operator() = vo_equal, @@ -1202,7 +1201,7 @@ DepList::add_package(const std::tr1::shared_ptr<const PackageID> & p, const std: our_merge_entry_post_position = _imp->merge_list.insert(next(our_merge_entry_post_position), DepListEntry(make_named_values<DepListEntry>( n::associated_entry() = &*_imp->current_merge_list_entry, - n::destination() = std::tr1::shared_ptr<Repository>(), + n::destination() = std::shared_ptr<Repository>(), n::generation() = _imp->merge_list_generation, n::handled() = make_shared_ptr(new DepListEntryNoHandlingRequired), n::kind() = dlk_provided, @@ -1210,7 +1209,7 @@ DepList::add_package(const std::tr1::shared_ptr<const PackageID> & p, const std: RepositoryName("virtuals"))).make_virtuals_interface()->make_virtual_package_id( QualifiedPackageName((*i)->text()), p), n::state() = dle_has_all_deps, - n::tags() = std::tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags) + n::tags() = std::shared_ptr<DepListEntryTags>(new DepListEntryTags) ))); _imp->merge_list_index.insert(std::make_pair((*i)->text(), our_merge_entry_post_position)); } @@ -1266,7 +1265,7 @@ DepList::add_package(const std::tr1::shared_ptr<const PackageID> & p, const std: } void -DepList::add_error_package(const std::tr1::shared_ptr<const PackageID> & p, const DepListEntryKind kind, +DepList::add_error_package(const std::shared_ptr<const PackageID> & p, const DepListEntryKind kind, const PackageDepSpec & pds) { std::pair<MergeListIndex::iterator, MergeListIndex::const_iterator> pp( @@ -1279,7 +1278,7 @@ DepList::add_error_package(const std::tr1::shared_ptr<const PackageID> & p, cons if (_imp->current_package_id()) pp.first->second->tags()->insert(make_named_values<DepTagEntry>( n::generation() = _imp->merge_list_generation, - n::tag() = std::tr1::shared_ptr<DepTag>(new DependencyDepTag(_imp->current_package_id(), pds)) + n::tag() = std::shared_ptr<DepTag>(new DependencyDepTag(_imp->current_package_id(), pds)) )); return; } @@ -1289,27 +1288,27 @@ DepList::add_error_package(const std::tr1::shared_ptr<const PackageID> & p, cons _imp->merge_list.insert(_imp->merge_list.begin(), make_named_values<DepListEntry>( n::associated_entry() = &*_imp->current_merge_list_entry, - n::destination() = std::tr1::shared_ptr<Repository>(), + n::destination() = std::shared_ptr<Repository>(), n::generation() = _imp->merge_list_generation, n::handled() = make_shared_ptr(new DepListEntryNoHandlingRequired), n::kind() = kind, n::package_id() = p, n::state() = dle_has_all_deps, - n::tags() = std::tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags) + n::tags() = std::shared_ptr<DepListEntryTags>(new DepListEntryTags) ))); if (_imp->current_package_id()) our_merge_entry_position->tags()->insert(make_named_values<DepTagEntry>( n::generation() = _imp->merge_list_generation, - n::tag() = std::tr1::shared_ptr<DepTag>(new DependencyDepTag(_imp->current_package_id(), pds)) + n::tag() = std::shared_ptr<DepTag>(new DependencyDepTag(_imp->current_package_id(), pds)) )); _imp->merge_list_index.insert(std::make_pair(p->name(), our_merge_entry_position)); } void -DepList::add_suggested_package(const std::tr1::shared_ptr<const PackageID> & p, - const PackageDepSpec & pds, const std::tr1::shared_ptr<const DestinationsSet> & destinations) +DepList::add_suggested_package(const std::shared_ptr<const PackageID> & p, + const PackageDepSpec & pds, const std::shared_ptr<const DestinationsSet> & destinations) { std::pair<MergeListIndex::iterator, MergeListIndex::const_iterator> pp( _imp->merge_list_index.equal_range(p->name())); @@ -1332,13 +1331,13 @@ DepList::add_suggested_package(const std::tr1::shared_ptr<const PackageID> & p, n::kind() = dlk_suggested, n::package_id() = p, n::state() = dle_has_all_deps, - n::tags() = std::tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags) + n::tags() = std::shared_ptr<DepListEntryTags>(new DepListEntryTags) ))); if (_imp->current_package_id()) our_merge_entry_position->tags()->insert(make_named_values<DepTagEntry>( n::generation() = _imp->merge_list_generation, - n::tag() = std::tr1::shared_ptr<DepTag>(new DependencyDepTag(_imp->current_package_id(), pds)) + n::tag() = std::shared_ptr<DepTag>(new DependencyDepTag(_imp->current_package_id(), pds)) )); _imp->merge_list_index.insert(std::make_pair(p->name(), our_merge_entry_position)); @@ -1346,7 +1345,7 @@ DepList::add_suggested_package(const std::tr1::shared_ptr<const PackageID> & p, void DepList::add_predeps(const DependencySpecTree::BasicNode & d, const DepListDepsOption opt, const std::string & s, - const std::tr1::shared_ptr<const DestinationsSet> & destinations, const bool only_if_not_suggested_label) + const std::shared_ptr<const DestinationsSet> & destinations, const bool only_if_not_suggested_label) { if (dl_deps_pre == opt || dl_deps_pre_or_post == opt) { @@ -1368,7 +1367,7 @@ DepList::add_predeps(const DependencySpecTree::BasicNode & d, const DepListDepsO void DepList::add_postdeps(const DependencySpecTree::BasicNode & d, const DepListDepsOption opt, const std::string & s, - const std::tr1::shared_ptr<const DestinationsSet> & destinations, const bool only_if_not_suggested_label) + const std::shared_ptr<const DestinationsSet> & destinations, const bool only_if_not_suggested_label) { if (dl_deps_pre_or_post == opt || dl_deps_post == opt || dl_deps_try_post == opt) { @@ -1400,8 +1399,8 @@ DepList::add_postdeps(const DependencySpecTree::BasicNode & d, const DepListDeps } void -DepList::add_already_installed_package(const std::tr1::shared_ptr<const PackageID> & p, const std::tr1::shared_ptr<const DepTag> & tag, - const PackageDepSpec & pds, const std::tr1::shared_ptr<const DestinationsSet> & destinations) +DepList::add_already_installed_package(const std::shared_ptr<const PackageID> & p, const std::shared_ptr<const DepTag> & tag, + const PackageDepSpec & pds, const std::shared_ptr<const DestinationsSet> & destinations) { Context context("When adding installed package '" + stringify(*p) + "':"); _imp->env->trigger_notifier_callback(NotifierCallbackResolverStepEvent()); @@ -1411,13 +1410,13 @@ DepList::add_already_installed_package(const std::tr1::shared_ptr<const PackageI MergeList::iterator our_merge_entry(_imp->merge_list.insert(_imp->merge_list_insert_position, make_named_values<DepListEntry>( n::associated_entry() = static_cast<DepListEntry *>(0), - n::destination() = std::tr1::shared_ptr<Repository>(), + n::destination() = std::shared_ptr<Repository>(), n::generation() = _imp->merge_list_generation, n::handled() = make_shared_ptr(new DepListEntryNoHandlingRequired), n::kind() = dlk_already_installed, n::package_id() = p, n::state() = dle_has_pre_deps, - n::tags() = std::tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags) + n::tags() = std::shared_ptr<DepListEntryTags>(new DepListEntryTags) ))); _imp->merge_list_index.insert(std::make_pair(p->name(), our_merge_entry)); @@ -1430,7 +1429,7 @@ DepList::add_already_installed_package(const std::tr1::shared_ptr<const PackageI if (_imp->opts->dependency_tags() && _imp->current_package_id()) our_merge_entry->tags()->insert(make_named_values<DepTagEntry>( n::generation() = _imp->merge_list_generation, - n::tag() = std::tr1::shared_ptr<DepTag>(new DependencyDepTag(_imp->current_package_id(), pds)) + n::tag() = std::shared_ptr<DepTag>(new DependencyDepTag(_imp->current_package_id(), pds)) )); Save<MergeList::const_iterator> save_current_merge_list_entry(&_imp->current_merge_list_entry, @@ -1610,7 +1609,7 @@ DepList::prefer_installed_over_uninstalled(const PackageID & installed, bool DepList::already_installed(const DependencySpecTree::BasicNode & spec, - const std::tr1::shared_ptr<const DestinationsSet> & destinations) const + const std::shared_ptr<const DestinationsSet> & destinations) const { QueryVisitor visitor(this, destinations, _imp->env, _imp->current_package_id()); spec.accept(visitor); @@ -1685,9 +1684,9 @@ DepList::has_errors() const return end() != std::find_if(begin(), end(), IsError()); } -std::tr1::shared_ptr<Repository> +std::shared_ptr<Repository> DepList::find_destination(const PackageID & p, - const std::tr1::shared_ptr<const DestinationsSet> & dd) + const std::shared_ptr<const DestinationsSet> & dd) { for (DestinationsSet::ConstIterator d(dd->begin()), d_end(dd->end()) ; d != d_end ; ++d) @@ -1749,7 +1748,7 @@ paludis::is_viable_any_child(const DependencySpecTree::BasicNode & i) return true; } -template class Sequence<std::tr1::function<bool (const PackageID &, const Mask &)> >; +template class Sequence<std::function<bool (const PackageID &, const Mask &)> >; template class WrappedForwardIterator<DepList::IteratorTag, DepListEntry>; template class WrappedForwardIterator<DepList::ConstIteratorTag, const DepListEntry>; diff --git a/paludis/dep_list.hh b/paludis/dep_list.hh index c7fac0b9b..340bc8245 100644 --- a/paludis/dep_list.hh +++ b/paludis/dep_list.hh @@ -32,7 +32,7 @@ #include <paludis/util/private_implementation_pattern.hh> #include <paludis/util/options.hh> #include <paludis/version_spec.hh> -#include <tr1/functional> +#include <functional> #include <iosfwd> /** \file @@ -85,7 +85,7 @@ namespace paludis * * \ingroup g_dep_list */ - typedef Sequence<std::tr1::function<bool (const PackageID &, const Mask &)> > DepListOverrideMasksFunctions; + typedef Sequence<std::function<bool (const PackageID &, const Mask &)> > DepListOverrideMasksFunctions; /** * An entry in a DepList. @@ -97,13 +97,13 @@ namespace paludis struct DepListEntry { NamedValue<n::associated_entry, const DepListEntry *> associated_entry; - NamedValue<n::destination, std::tr1::shared_ptr<Repository> > destination; + NamedValue<n::destination, std::shared_ptr<Repository> > destination; NamedValue<n::generation, long> generation; - NamedValue<n::handled, std::tr1::shared_ptr<const DepListEntryHandled> > handled; + NamedValue<n::handled, std::shared_ptr<const DepListEntryHandled> > handled; NamedValue<n::kind, DepListEntryKind> kind; - NamedValue<n::package_id, std::tr1::shared_ptr<const PackageID> > package_id; + NamedValue<n::package_id, std::shared_ptr<const PackageID> > package_id; NamedValue<n::state, DepListEntryState> state; - NamedValue<n::tags, std::tr1::shared_ptr<DepListEntryTags> > tags; + NamedValue<n::tags, std::shared_ptr<DepListEntryTags> > tags; }; /** @@ -127,7 +127,7 @@ namespace paludis NamedValue<n::installed_deps_runtime, DepListDepsOption> installed_deps_runtime; NamedValue<n::match_package_options, MatchPackageOptions> match_package_options; NamedValue<n::new_slots, DepListNewSlotsOption> new_slots; - NamedValue<n::override_masks, std::tr1::shared_ptr<DepListOverrideMasksFunctions> > override_masks; + NamedValue<n::override_masks, std::shared_ptr<DepListOverrideMasksFunctions> > override_masks; NamedValue<n::reinstall, DepListReinstallOption> reinstall; NamedValue<n::reinstall_scm, DepListReinstallScmOption> reinstall_scm; NamedValue<n::suggested, DepListSuggestedOption> suggested; @@ -156,14 +156,14 @@ namespace paludis /** * Find an appropriate destination for a package. */ - std::tr1::shared_ptr<Repository> find_destination(const PackageID &, - const std::tr1::shared_ptr<const DestinationsSet> &); + std::shared_ptr<Repository> find_destination(const PackageID &, + const std::shared_ptr<const DestinationsSet> &); /** * Add a DepSpec with role context. */ void add_in_role(const bool only_if_not_suggested_label, const DependencySpecTree::BasicNode &, const std::string & role, - const std::tr1::shared_ptr<const DestinationsSet> &); + const std::shared_ptr<const DestinationsSet> &); /** * Return whether we prefer the first parameter, which is installed, @@ -175,31 +175,31 @@ namespace paludis /** * Add a package to the list. */ - void add_package(const std::tr1::shared_ptr<const PackageID> &, const std::tr1::shared_ptr<const DepTag> &, - const PackageDepSpec &, const std::tr1::shared_ptr<const DestinationsSet> & destinations); + void add_package(const std::shared_ptr<const PackageID> &, const std::shared_ptr<const DepTag> &, + const PackageDepSpec &, const std::shared_ptr<const DestinationsSet> & destinations); /** * Add an already installed package to the list. */ - void add_already_installed_package(const std::tr1::shared_ptr<const PackageID> &, const std::tr1::shared_ptr<const DepTag> &, - const PackageDepSpec &, const std::tr1::shared_ptr<const DestinationsSet> & destinations); + void add_already_installed_package(const std::shared_ptr<const PackageID> &, const std::shared_ptr<const DepTag> &, + const PackageDepSpec &, const std::shared_ptr<const DestinationsSet> & destinations); /** * Add an error package to the list. */ - void add_error_package(const std::tr1::shared_ptr<const PackageID> &, const DepListEntryKind, const PackageDepSpec &); + void add_error_package(const std::shared_ptr<const PackageID> &, const DepListEntryKind, const PackageDepSpec &); /** * Add predependencies. */ void add_predeps(const DependencySpecTree::BasicNode &, const DepListDepsOption, const std::string &, - const std::tr1::shared_ptr<const DestinationsSet> & destinations, const bool only_if_not_suggested_label); + const std::shared_ptr<const DestinationsSet> & destinations, const bool only_if_not_suggested_label); /** * Add postdependencies. */ void add_postdeps(const DependencySpecTree::BasicNode &, const DepListDepsOption, const std::string &, - const std::tr1::shared_ptr<const DestinationsSet> & destinations, const bool only_if_not_suggested_label); + const std::shared_ptr<const DestinationsSet> & destinations, const bool only_if_not_suggested_label); /** * Return whether the specified PackageID is matched by @@ -210,7 +210,7 @@ namespace paludis void add_not_top_level( const bool only_if_not_suggested_label, const DependencySpecTree::BasicNode &, - const std::tr1::shared_ptr<const DestinationsSet> & target_destinations); + const std::shared_ptr<const DestinationsSet> & target_destinations); public: ///\name Basic operations @@ -245,26 +245,26 @@ namespace paludis /** * Our options. */ - std::tr1::shared_ptr<DepListOptions> options(); + std::shared_ptr<DepListOptions> options(); /** * Our options. */ - const std::tr1::shared_ptr<const DepListOptions> options() const; + const std::shared_ptr<const DepListOptions> options() const; /** * Add the packages required to resolve an additional dependency * spec. */ void add(const SetSpecTree &, - const std::tr1::shared_ptr<const DestinationsSet> & target_destinations); + const std::shared_ptr<const DestinationsSet> & target_destinations); /** * Add the packages required to resolve an additional dependency * spec. */ void add(const PackageDepSpec &, - const std::tr1::shared_ptr<const DestinationsSet> & target_destinations); + const std::shared_ptr<const DestinationsSet> & target_destinations); /** * Manually add a DepListEntry to the list. @@ -284,7 +284,7 @@ namespace paludis * Return whether a spec structure is already installed. */ bool already_installed(const DependencySpecTree::BasicNode &, - const std::tr1::shared_ptr<const DestinationsSet> & target_destinations) const; + const std::shared_ptr<const DestinationsSet> & target_destinations) const; /** * Return whether a PackageID has been replaced. @@ -304,8 +304,8 @@ namespace paludis /** * Add a suggested package to the list. */ - void add_suggested_package(const std::tr1::shared_ptr<const PackageID> &, - const PackageDepSpec &, const std::tr1::shared_ptr<const DestinationsSet> & destinations); + void add_suggested_package(const std::shared_ptr<const PackageID> &, + const PackageDepSpec &, const std::shared_ptr<const DestinationsSet> & destinations); }; extern template class PrivateImplementationPattern<DepList>; diff --git a/paludis/dep_list_TEST.cc b/paludis/dep_list_TEST.cc index 3b91dd3c1..e69da194e 100644 --- a/paludis/dep_list_TEST.cc +++ b/paludis/dep_list_TEST.cc @@ -450,7 +450,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("enabled? ( cat/two )"); idcat->choices_key()->add("", "enabled"); repo->add_version("cat", "two", "1"); @@ -472,7 +472,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("!enabled? ( cat/two )"); idcat->choices_key()->add("", "enabled"); repo->add_version("cat", "two", "1"); @@ -493,7 +493,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("disabled? ( cat/two )"); idcat->choices_key()->add("", "disabled"); repo->add_version("cat", "two", "1"); @@ -514,7 +514,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("!disabled? ( cat/two )"); idcat->choices_key()->add("", "disabled"); repo->add_version("cat", "two", "1"); @@ -536,7 +536,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("|| ( enabled? ( cat/two ) cat/three )"); idcat->choices_key()->add("", "enabled"); repo->add_version("cat", "two", "1"); @@ -559,7 +559,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("|| ( !enabled? ( cat/two ) cat/three )"); idcat->choices_key()->add("", "enabled"); repo->add_version("cat", "two", "1"); @@ -582,7 +582,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("|| ( disabled? ( cat/two ) cat/three )"); idcat->choices_key()->add("", "disabled"); repo->add_version("cat", "two", "1"); @@ -605,7 +605,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("|| ( !disabled? ( cat/two ) cat/three )"); idcat->choices_key()->add("", "disabled"); repo->add_version("cat", "two", "1"); @@ -628,7 +628,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("cat/three || ( enabled? ( cat/two ) cat/three )"); idcat->choices_key()->add("", "enabled"); repo->add_version("cat", "two", "1"); @@ -651,7 +651,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("cat/three || ( !enabled? ( cat/two ) cat/three )"); idcat->choices_key()->add("", "enabled"); repo->add_version("cat", "two", "1"); @@ -674,7 +674,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("cat/three || ( disabled? ( cat/two ) cat/three )"); idcat->choices_key()->add("", "disabled"); repo->add_version("cat", "two", "1"); @@ -697,7 +697,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("cat/three || ( !disabled? ( cat/two ) cat/three )"); idcat->choices_key()->add("", "disabled"); repo->add_version("cat", "two", "1"); @@ -720,7 +720,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("cat/three || ( enabled? ( cat/three ) cat/two )"); idcat->choices_key()->add("", "enabled"); repo->add_version("cat", "two", "1"); @@ -743,7 +743,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("cat/three || ( !enabled? ( cat/three ) cat/two )"); idcat->choices_key()->add("", "enabled"); repo->add_version("cat", "two", "1"); @@ -767,7 +767,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("cat/three || ( disabled? ( cat/three ) cat/two )"); idcat->choices_key()->add("", "disabled"); repo->add_version("cat", "two", "1"); @@ -791,7 +791,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("cat/three || ( !disabled? ( cat/three ) cat/two )"); idcat->choices_key()->add("", "disabled"); repo->add_version("cat", "two", "1"); @@ -814,7 +814,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("|| ( enabled1? ( cat/two ) enabled2? ( cat/three ) )"); idcat->choices_key()->add("", "enabled1"); idcat->choices_key()->add("", "enabled2"); @@ -838,7 +838,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("|| ( !enabled1? ( cat/two ) enabled2? ( cat/three ) )"); idcat->choices_key()->add("", "enabled1"); idcat->choices_key()->add("", "enabled2"); @@ -862,7 +862,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "one", "1")); idcat->build_dependencies_key()->set_from_string("|| ( !enabled1? ( cat/two ) !enabled2? ( cat/three ) )"); idcat->choices_key()->add("", "enabled1"); idcat->choices_key()->add("", "enabled2"); @@ -1325,7 +1325,7 @@ namespace test_cases void populate_repo() { repo->add_version("cat", "one", "1")->provide_key()->set_from_string("virtual/foo"); - std::tr1::shared_ptr<FakePackageID> m(repo->add_version("cat", "two", "2")); + std::shared_ptr<FakePackageID> m(repo->add_version("cat", "two", "2")); m->provide_key()->set_from_string("virtual/foo"); m->build_dependencies_key()->set_from_string("cat/one"); } @@ -1349,9 +1349,9 @@ namespace test_cases { void set_options(DepListOptions & opts) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; opts.override_masks().reset(new DepListOverrideMasksFunctions); - opts.override_masks()->push_back(std::tr1::bind(&override_tilde_keywords, &env, _1, _2)); + opts.override_masks()->push_back(std::bind(&override_tilde_keywords, &env, _1, _2)); } void populate_repo() @@ -1421,9 +1421,9 @@ namespace test_cases { void set_options(DepListOptions & opts) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; opts.override_masks().reset(new DepListOverrideMasksFunctions); - opts.override_masks()->push_back(std::tr1::bind(&override_tilde_keywords, &env, _1, _2)); + opts.override_masks()->push_back(std::bind(&override_tilde_keywords, &env, _1, _2)); } void populate_repo() @@ -1449,19 +1449,19 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/enabled[pkgname?] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "enabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "disabled", "1")); idcat3->build_dependencies_key()->set_from_string("( cat4/enabled[pkgname?] )"); idcat3->choices_key()->add("", "pkgname"); repo->add_version("cat4", "enabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat5(repo->add_version("cat5", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat5(repo->add_version("cat5", "disabled", "1")); idcat5->build_dependencies_key()->set_from_string("( cat6/disabled[pkgname?] )"); idcat5->choices_key()->add("", "pkgname"); repo->add_version("cat6", "disabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); idcat->build_dependencies_key()->set_from_string("( cat5/disabled cat3/disabled cat1/enabled )"); idcat->choices_key()->add("", "pkgname"); } @@ -1487,7 +1487,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/disabled[pkgname?] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "disabled", "1")->choices_key()->add("", "pkgname"); @@ -1517,19 +1517,19 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/enabled[pkgname!?] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "enabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "enabled", "1")); idcat3->build_dependencies_key()->set_from_string("( cat4/enabled[pkgname!?] )"); idcat3->choices_key()->add("", "pkgname"); repo->add_version("cat4", "enabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat5(repo->add_version("cat5", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat5(repo->add_version("cat5", "enabled", "1")); idcat5->build_dependencies_key()->set_from_string("( cat6/disabled[pkgname!?] )"); idcat5->choices_key()->add("", "pkgname"); repo->add_version("cat6", "disabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); idcat->build_dependencies_key()->set_from_string("( cat5/enabled cat3/enabled cat1/disabled )"); idcat->choices_key()->add("", "pkgname"); } @@ -1555,7 +1555,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/disabled[pkgname!?] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "disabled", "1")->choices_key()->add("", "pkgname"); @@ -1585,19 +1585,19 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/disabled[-pkgname?] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "disabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "disabled", "1")); idcat3->build_dependencies_key()->set_from_string("( cat4/enabled[-pkgname?] )"); idcat3->choices_key()->add("", "pkgname"); repo->add_version("cat4", "enabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat5(repo->add_version("cat5", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat5(repo->add_version("cat5", "disabled", "1")); idcat5->build_dependencies_key()->set_from_string("( cat6/disabled[-pkgname?] )"); idcat5->choices_key()->add("", "pkgname"); repo->add_version("cat6", "disabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); idcat->build_dependencies_key()->set_from_string("( cat5/disabled cat3/disabled cat1/enabled )"); idcat->choices_key()->add("", "pkgname"); } @@ -1623,7 +1623,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/enabled[-pkgname?] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "enabled", "1")->choices_key()->add("", "pkgname"); @@ -1653,19 +1653,19 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/disabled[-pkgname!?] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "disabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "enabled", "1")); idcat3->build_dependencies_key()->set_from_string("( cat4/enabled[-pkgname!?] )"); idcat3->choices_key()->add("", "pkgname"); repo->add_version("cat4", "enabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat5(repo->add_version("cat5", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat5(repo->add_version("cat5", "enabled", "1")); idcat5->build_dependencies_key()->set_from_string("( cat6/disabled[-pkgname!?] )"); idcat5->choices_key()->add("", "pkgname"); repo->add_version("cat6", "disabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); idcat->build_dependencies_key()->set_from_string("( cat5/enabled cat3/enabled cat1/disabled )"); idcat->choices_key()->add("", "pkgname"); } @@ -1691,7 +1691,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/disabled[-pkgname!?] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "enabled", "1")->choices_key()->add("", "pkgname"); @@ -1721,15 +1721,15 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/enabled[pkgname=] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "enabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "disabled", "1")); idcat3->build_dependencies_key()->set_from_string("( cat4/disabled[pkgname=] )"); idcat3->choices_key()->add("", "pkgname"); repo->add_version("cat4", "disabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); idcat->build_dependencies_key()->set_from_string("( cat3/disabled cat1/enabled )"); idcat->choices_key()->add("", "pkgname"); } @@ -1753,7 +1753,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/disabled[pkgname=] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "disabled", "1")->choices_key()->add("", "pkgname"); @@ -1783,7 +1783,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/enabled[pkgname=] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "enabled", "1")->choices_key()->add("", "pkgname"); @@ -1813,15 +1813,15 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/disabled[pkgname!=] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "disabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat3(repo->add_version("cat3", "disabled", "1")); idcat3->build_dependencies_key()->set_from_string("( cat4/enabled[pkgname!=] )"); idcat3->choices_key()->add("", "pkgname"); repo->add_version("cat4", "enabled", "1")->choices_key()->add("", "pkgname"); - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "all", "1")); idcat->build_dependencies_key()->set_from_string("( cat3/disabled cat1/enabled )"); idcat->choices_key()->add("", "pkgname"); } @@ -1845,7 +1845,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "enabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/disabled[pkgname!=] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "enabled", "1")->choices_key()->add("", "pkgname"); @@ -1875,7 +1875,7 @@ namespace test_cases { void populate_repo() { - std::tr1::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); + std::shared_ptr<FakePackageID> idcat1(repo->add_version("cat1", "disabled", "1")); idcat1->build_dependencies_key()->set_from_string("( cat2/enabled[pkgname!=] )"); idcat1->choices_key()->add("", "pkgname"); repo->add_version("cat2", "disabled", "1")->choices_key()->add("", "pkgname"); @@ -1906,7 +1906,7 @@ namespace test_cases void populate_repo() { repo->add_version("cat", "pkg-bin", "1"); - std::tr1::shared_ptr<FakePackageID> catpkg(repo->add_version("cat", "pkg", "1")); + std::shared_ptr<FakePackageID> catpkg(repo->add_version("cat", "pkg", "1")); catpkg->build_dependencies_key()->set_from_string("|| ( cat/pkg-bin cat/pkg )"); } @@ -1929,11 +1929,11 @@ namespace test_cases void run() { TestEnvironment env; - std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( + std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo")))); env.package_database()->add_repository(1, repo); - std::tr1::shared_ptr<FakeInstalledRepository> destination_repo(new FakeInstalledRepository( + std::shared_ptr<FakeInstalledRepository> destination_repo(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("installed_repo"), @@ -1976,11 +1976,11 @@ namespace test_cases void run() { TestEnvironment env; - std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( + std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo")))); env.package_database()->add_repository(1, repo); - std::tr1::shared_ptr<FakeInstalledRepository> destination_repo(new FakeInstalledRepository( + std::shared_ptr<FakeInstalledRepository> destination_repo(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("installed_repo"), @@ -2024,13 +2024,13 @@ namespace test_cases { TestEnvironment env; - std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( + std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo")))); env.package_database()->add_repository(1, repo); repo->add_version("cat", "one", "1"); - std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( + std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("installed_repo"), @@ -2058,13 +2058,13 @@ namespace test_cases { TestEnvironment env; - std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( + std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo")))); env.package_database()->add_repository(1, repo); repo->add_version("cat", "one", "1")->build_dependencies_key()->set_from_string("cat/two"); - std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( + std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("installed_repo"), @@ -2093,13 +2093,13 @@ namespace test_cases { TestEnvironment env; - std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( + std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo")))); env.package_database()->add_repository(1, repo); repo->add_version("cat", "one", "1")->build_dependencies_key()->set_from_string("cat/two"); - std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( + std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("installed_repo"), @@ -2130,13 +2130,13 @@ namespace test_cases { TestEnvironment env; - std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( + std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo")))); env.package_database()->add_repository(1, repo); repo->add_version("cat", "one", "1")->build_dependencies_key()->set_from_string("cat/two"); - std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( + std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("installed_repo"), @@ -2164,13 +2164,13 @@ namespace test_cases DepList d3(&env, DepListOptions()); d3.options()->fall_back() = dl_fall_back_as_needed_except_targets; - std::tr1::shared_ptr<SetSpecTree> t3(new SetSpecTree(make_shared_ptr(new AllDepSpec))); + std::shared_ptr<SetSpecTree> t3(new SetSpecTree(make_shared_ptr(new AllDepSpec))); t3->root()->append(make_shared_ptr(new PackageDepSpec(parse_user_package_dep_spec("cat/one", &env, UserPackageDepSpecOptions())))); t3->root()->append(make_shared_ptr(new PackageDepSpec(parse_user_package_dep_spec("cat/two", &env, UserPackageDepSpecOptions())))); TEST_CHECK_THROWS(d3.add(*t3, env.default_destinations()), DepListError); DepList d4(&env, DepListOptions()); - std::tr1::shared_ptr<SetSpecTree> t4(new SetSpecTree(make_shared_ptr(new AllDepSpec))); + std::shared_ptr<SetSpecTree> t4(new SetSpecTree(make_shared_ptr(new AllDepSpec))); t4->root()->append(make_shared_ptr(new PackageDepSpec(parse_user_package_dep_spec("cat/one", &env, UserPackageDepSpecOptions())))); t4->root()->append(make_shared_ptr(new PackageDepSpec(parse_user_package_dep_spec("cat/three", &env, UserPackageDepSpecOptions())))); TEST_CHECK_THROWS(d4.add(*t4, env.default_destinations()), DepListError); @@ -2188,14 +2188,14 @@ namespace test_cases { TestEnvironment env; - std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( + std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo")))); env.package_database()->add_repository(1, repo); repo->add_version("cat", "one", "1")->build_dependencies_key()->set_from_string("cat/two"); repo->add_version("cat", "two", "2"); - std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( + std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("installed_repo"), @@ -2214,7 +2214,7 @@ namespace test_cases DepList d2(&env, DepListOptions()); d2.options()->upgrade() = dl_upgrade_as_needed; - std::tr1::shared_ptr<SetSpecTree> t2(new SetSpecTree(make_shared_ptr(new AllDepSpec))); + std::shared_ptr<SetSpecTree> t2(new SetSpecTree(make_shared_ptr(new AllDepSpec))); t2->root()->append(make_shared_ptr(new PackageDepSpec(parse_user_package_dep_spec("cat/one", &env, UserPackageDepSpecOptions())))); t2->root()->append(make_shared_ptr(new PackageDepSpec(parse_user_package_dep_spec("cat/two", &env, UserPackageDepSpecOptions())))); d2.add(*t2, env.default_destinations()); @@ -2233,7 +2233,7 @@ namespace test_cases { TestEnvironment env; - std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( + std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo")))); env.package_database()->add_repository(1, repo); @@ -2246,7 +2246,7 @@ namespace test_cases repo->add_version("cat", "five-svn", "0"); repo->add_version("cat", "six-darcs", "0"); - std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( + std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("installed_repo"), @@ -2282,18 +2282,18 @@ namespace test_cases { TestEnvironment env; - std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( + std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo")))); env.package_database()->add_repository(1, repo); repo->add_version("cat", "one", "1")->build_dependencies_key()->set_from_string("cat/three"); - std::tr1::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "two", "1")); + std::shared_ptr<FakePackageID> idcat(repo->add_version("cat", "two", "1")); idcat->build_dependencies_key()->set_from_string("enabled? ( || ( ( <cat/three-1 cat/three:0 =cat/four-1 ) cat/five ) )"); idcat->choices_key()->add("", "enabled"); repo->add_version("cat", "three", "0.9"); repo->add_version("cat", "four", "1"); - std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( + std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("installed_repo"), @@ -2306,11 +2306,11 @@ namespace test_cases d1.options()->dependency_tags() = true; PackageDepSpec with_target_tag(parse_user_package_dep_spec("cat/one", &env, UserPackageDepSpecOptions())); - with_target_tag.set_tag(std::tr1::shared_ptr<const DepTag>(new TargetDepTag)); + with_target_tag.set_tag(std::shared_ptr<const DepTag>(new TargetDepTag)); d1.add(with_target_tag, env.default_destinations()); PackageDepSpec with_set_tag(parse_user_package_dep_spec("cat/two", &env, UserPackageDepSpecOptions())); - with_set_tag.set_tag(std::tr1::shared_ptr<const DepTag>(new GeneralSetDepTag(SetName("set"), "test"))); + with_set_tag.set_tag(std::shared_ptr<const DepTag>(new GeneralSetDepTag(SetName("set"), "test"))); d1.add(with_set_tag, env.default_destinations()); TEST_CHECK_EQUAL(join(d1.begin(), d1.end(), " "), "cat/three-0.9:0::repo cat/one-1:0::repo " @@ -2318,7 +2318,7 @@ namespace test_cases // tags for cat/three DepList::Iterator it(d1.begin()); - std::tr1::shared_ptr<DepListEntryTags> tags(it->tags()); + std::shared_ptr<DepListEntryTags> tags(it->tags()); TEST_CHECK_EQUAL(tags->size(), 3U); // tags for cat/one @@ -2332,8 +2332,8 @@ namespace test_cases tags = it->tags(); TEST_CHECK_EQUAL(tags->size(), 1U); TEST_CHECK_EQUAL(tags->begin()->tag()->category(), "dependency"); - std::tr1::shared_ptr<const DependencyDepTag> deptag( - std::tr1::static_pointer_cast<const DependencyDepTag>(tags->begin()->tag())); + std::shared_ptr<const DependencyDepTag> deptag( + std::static_pointer_cast<const DependencyDepTag>(tags->begin()->tag())); TEST_CHECK_EQUAL(deptag->short_text(), "cat/two-1:0::repo"); TEST_CHECK_STRINGIFY_EQUAL(*deptag->dependency(), "=cat/four-1"); diff --git a/paludis/dep_list_TEST.hh b/paludis/dep_list_TEST.hh index 17b0aae24..a216ecd7e 100644 --- a/paludis/dep_list_TEST.hh +++ b/paludis/dep_list_TEST.hh @@ -110,11 +110,11 @@ namespace test_cases { protected: TestEnvironment env; - std::tr1::shared_ptr<FakeRepository> repo; - std::tr1::shared_ptr<FakeInstalledRepository> installed_repo; + std::shared_ptr<FakeRepository> repo; + std::shared_ptr<FakeInstalledRepository> installed_repo; #ifdef ENABLE_VIRTUALS_REPOSITORY - std::tr1::shared_ptr<Repository> virtuals_repo; - std::tr1::shared_ptr<Repository> installed_virtuals_repo; + std::shared_ptr<Repository> virtuals_repo; + std::shared_ptr<Repository> installed_virtuals_repo; #endif std::list<std::string> expected; std::string merge_target; diff --git a/paludis/dep_list_TEST_blockers.cc b/paludis/dep_list_TEST_blockers.cc index 3e5b95d8c..2e311efcc 100644 --- a/paludis/dep_list_TEST_blockers.cc +++ b/paludis/dep_list_TEST_blockers.cc @@ -87,7 +87,7 @@ namespace test_cases void populate_repo() { repo->add_version("cat", "one", "1")->build_dependencies_key()->set_from_string("cat/two"); - std::tr1::shared_ptr<FakePackageID> two_m(repo->add_version("cat", "two", "1")); + std::shared_ptr<FakePackageID> two_m(repo->add_version("cat", "two", "1")); two_m->build_dependencies_key()->set_from_string("!virtual/two"); two_m->provide_key()->set_from_string("virtual/two"); } @@ -108,7 +108,7 @@ namespace test_cases void populate_repo() { repo->add_version("cat", "one", "1")->build_dependencies_key()->set_from_string("cat/two"); - std::tr1::shared_ptr<FakePackageID> two_m(repo->add_version("cat", "two", "1")); + std::shared_ptr<FakePackageID> two_m(repo->add_version("cat", "two", "1")); two_m->build_dependencies_key()->set_from_string("!virtual/two"); two_m->provide_key()->set_from_string("virtual/two"); installed_repo->add_version("other", "two", "1")->provide_key()->set_from_string("virtual/two"); @@ -217,11 +217,11 @@ namespace test_cases void populate_repo() { - std::tr1::shared_ptr<FakePackageID> one_m(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> one_m(repo->add_version("cat", "one", "1")); one_m->provide_key()->set_from_string("virtual/one"); one_m->build_dependencies_key()->set_from_string("!virtual/one"); one_m->run_dependencies_key()->set_from_string("!virtual/one"); - std::tr1::shared_ptr<FakePackageID> i_one_m(installed_repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> i_one_m(installed_repo->add_version("cat", "one", "1")); i_one_m->provide_key()->set_from_string("virtual/one"); i_one_m->run_dependencies_key()->set_from_string("!virtual/one"); } @@ -240,11 +240,11 @@ namespace test_cases void populate_repo() { - std::tr1::shared_ptr<FakePackageID> one_m(repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> one_m(repo->add_version("cat", "one", "1")); one_m->provide_key()->set_from_string("virtual/one"); one_m->build_dependencies_key()->set_from_string("!virtual/one"); one_m->run_dependencies_key()->set_from_string("!virtual/one"); - std::tr1::shared_ptr<FakePackageID> i_one_m(installed_repo->add_version("cat", "one", "1")); + std::shared_ptr<FakePackageID> i_one_m(installed_repo->add_version("cat", "one", "1")); i_one_m->provide_key()->set_from_string("virtual/one"); i_one_m->run_dependencies_key()->set_from_string("!virtual/one"); } @@ -269,7 +269,7 @@ namespace test_cases void populate_repo() { repo->add_version("cat", "one", "1")->build_dependencies_key()->set_from_string("cat/two"); - std::tr1::shared_ptr<FakePackageID> two_m(repo->add_version("cat", "two", "2")); + std::shared_ptr<FakePackageID> two_m(repo->add_version("cat", "two", "2")); two_m->provide_key()->set_from_string("virtual/two"); two_m->build_dependencies_key()->set_from_string("!virtual/two"); installed_repo->add_version("cat", "two", "1")->provide_key()->set_from_string("virtual/two"); @@ -320,7 +320,7 @@ namespace test_cases void populate_repo() { repo->add_version("cat", "one", "1")->build_dependencies_key()->set_from_string("cat/two"); - std::tr1::shared_ptr<FakePackageID> two_m(repo->add_version("cat", "two", "2")); + std::shared_ptr<FakePackageID> two_m(repo->add_version("cat", "two", "2")); two_m->build_dependencies_key()->set_from_string("!<virtual/two-2"); two_m->provide_key()->set_from_string("virtual/two"); installed_repo->add_version("cat", "two", "1")->provide_key()->set_from_string("virtual/two"); @@ -349,7 +349,7 @@ namespace test_cases void populate_repo() { repo->add_version("cat", "one", "1")->build_dependencies_key()->set_from_string("cat/two"); - std::tr1::shared_ptr<FakePackageID> two_m(repo->add_version("cat", "two", "2")); + std::shared_ptr<FakePackageID> two_m(repo->add_version("cat", "two", "2")); two_m->build_dependencies_key()->set_from_string("!<virtual/two-2"); two_m->provide_key()->set_from_string("virtual/two"); installed_repo->add_version("other", "two", "1")->provide_key()->set_from_string("virtual/two"); diff --git a/paludis/dep_list_exceptions.cc b/paludis/dep_list_exceptions.cc index 71e5e60b8..fe8aeab85 100644 --- a/paludis/dep_list_exceptions.cc +++ b/paludis/dep_list_exceptions.cc @@ -35,7 +35,7 @@ AllMaskedError::AllMaskedError(const PackageDepSpec & q) throw () : } AdditionalRequirementsNotMetError::AdditionalRequirementsNotMetError(const PackageDepSpec & q, - const std::tr1::shared_ptr<const PackageID> & i) throw () : + const std::shared_ptr<const PackageID> & i) throw () : DepListError("Error searching for '" + stringify(q) + "': additional requirements are not met on '" + stringify(*i) + "'"), _query(q), _id(i) @@ -68,7 +68,7 @@ DowngradeNotAllowedError::~DowngradeNotAllowedError() throw () namespace { std::string - destinations_to_string(std::tr1::shared_ptr<const DestinationsSet> dd) + destinations_to_string(std::shared_ptr<const DestinationsSet> dd) { std::string result; bool need_comma(false); @@ -86,7 +86,7 @@ namespace } NoDestinationError::NoDestinationError(const PackageID & p, - const std::tr1::shared_ptr<const DestinationsSet> & d) throw () : + const std::shared_ptr<const DestinationsSet> & d) throw () : DepListError("No suitable destination for '" + stringify(p) + "' in (" + destinations_to_string(d) + ")") { diff --git a/paludis/dep_list_exceptions.hh b/paludis/dep_list_exceptions.hh index 33a5a1858..f981ec81d 100644 --- a/paludis/dep_list_exceptions.hh +++ b/paludis/dep_list_exceptions.hh @@ -99,7 +99,7 @@ namespace paludis { private: PackageDepSpec _query; - const std::tr1::shared_ptr<const PackageID> _id; + const std::shared_ptr<const PackageID> _id; public: ///\name Basic operations @@ -107,7 +107,7 @@ namespace paludis AdditionalRequirementsNotMetError( const PackageDepSpec & query, - const std::tr1::shared_ptr<const PackageID> & id) throw (); + const std::shared_ptr<const PackageID> & id) throw (); virtual ~AdditionalRequirementsNotMetError() throw (); @@ -126,7 +126,7 @@ namespace paludis * * \since 0.44 */ - const std::tr1::shared_ptr<const PackageID> package_id() const + const std::shared_ptr<const PackageID> package_id() const { return _id; } @@ -202,7 +202,7 @@ namespace paludis ///\{ NoDestinationError(const PackageID &, - const std::tr1::shared_ptr<const DestinationsSet> &) throw (); + const std::shared_ptr<const DestinationsSet> &) throw (); ///\} }; diff --git a/paludis/dep_spec-fwd.hh b/paludis/dep_spec-fwd.hh index 60ed6dc8e..c2552a925 100644 --- a/paludis/dep_spec-fwd.hh +++ b/paludis/dep_spec-fwd.hh @@ -28,7 +28,7 @@ #include <paludis/util/attributes.hh> #include <paludis/util/sequence-fwd.hh> #include <paludis/util/options-fwd.hh> -#include <tr1/memory> +#include <memory> /** \file * Forward declarations for paludis/dep_spec.hh . @@ -101,7 +101,7 @@ namespace paludis * \since 0.26 * \ingroup g_dep_spec */ - typedef Sequence<std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> > AdditionalPackageDepSpecRequirements; + typedef Sequence<std::shared_ptr<const AdditionalPackageDepSpecRequirement> > AdditionalPackageDepSpecRequirements; /** * Create a PackageDepSpec from various rules. diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc index cceae4047..1fe30f7ca 100644 --- a/paludis/dep_spec.cc +++ b/paludis/dep_spec.cc @@ -37,7 +37,7 @@ #include <paludis/util/make_shared_ptr.hh> #include <paludis/util/fs_entry.hh> #include <paludis/metadata_key.hh> -#include <tr1/functional> +#include <functional> #include <algorithm> #include <list> #include <map> @@ -51,13 +51,13 @@ namespace paludis template <> struct Implementation<DepSpec> { - std::tr1::shared_ptr<const MetadataSectionKey> annotations_key; + std::shared_ptr<const MetadataSectionKey> annotations_key; Implementation() { } - Implementation(const std::tr1::shared_ptr<const MetadataSectionKey> & k) : + Implementation(const std::shared_ptr<const MetadataSectionKey> & k) : annotations_key(k) { } @@ -74,14 +74,14 @@ DepSpec::~DepSpec() { } -const std::tr1::shared_ptr<const MetadataSectionKey> +const std::shared_ptr<const MetadataSectionKey> DepSpec::annotations_key() const { return _imp->annotations_key; } void -DepSpec::set_annotations_key(const std::tr1::shared_ptr<const MetadataSectionKey> & k) +DepSpec::set_annotations_key(const std::shared_ptr<const MetadataSectionKey> & k) { clear_metadata_keys(); _imp->annotations_key = k; @@ -93,10 +93,10 @@ AnyDepSpec::AnyDepSpec() { } -std::tr1::shared_ptr<DepSpec> +std::shared_ptr<DepSpec> AnyDepSpec::clone() const { - std::tr1::shared_ptr<AnyDepSpec> result(new AnyDepSpec); + std::shared_ptr<AnyDepSpec> result(new AnyDepSpec); result->set_annotations_key(annotations_key()); return result; } @@ -116,10 +116,10 @@ AllDepSpec::need_keys_added() const { } -std::tr1::shared_ptr<DepSpec> +std::shared_ptr<DepSpec> AllDepSpec::clone() const { - std::tr1::shared_ptr<AllDepSpec> result(new AllDepSpec); + std::shared_ptr<AllDepSpec> result(new AllDepSpec); result->set_annotations_key(annotations_key()); return result; } @@ -129,11 +129,11 @@ namespace paludis template <> struct Implementation<ConditionalDepSpec> { - const std::tr1::shared_ptr<const ConditionalDepSpecData> data; + const std::shared_ptr<const ConditionalDepSpecData> data; Mutex mutex; bool added_keys; - Implementation(const std::tr1::shared_ptr<const ConditionalDepSpecData> & d) : + Implementation(const std::shared_ptr<const ConditionalDepSpecData> & d) : data(d), added_keys(false) { @@ -141,7 +141,7 @@ namespace paludis }; } -ConditionalDepSpec::ConditionalDepSpec(const std::tr1::shared_ptr<const ConditionalDepSpecData> & d) : +ConditionalDepSpec::ConditionalDepSpec(const std::shared_ptr<const ConditionalDepSpecData> & d) : PrivateImplementationPattern<ConditionalDepSpec>(new Implementation<ConditionalDepSpec>(d)), _imp(PrivateImplementationPattern<ConditionalDepSpec>::_imp) { @@ -178,9 +178,9 @@ ConditionalDepSpec::need_keys_added() const if (! _imp->added_keys) { _imp->added_keys = true; - using namespace std::tr1::placeholders; + using namespace std::placeholders; std::for_each(_imp->data->begin_metadata(), _imp->data->end_metadata(), - std::tr1::bind(&ConditionalDepSpec::add_metadata_key, this, _1)); + std::bind(&ConditionalDepSpec::add_metadata_key, this, _1)); } } @@ -204,7 +204,7 @@ ConditionalDepSpec::condition_meetable() const return _imp->data->condition_meetable(); } -const std::tr1::shared_ptr<const ConditionalDepSpecData> +const std::shared_ptr<const ConditionalDepSpecData> ConditionalDepSpec::data() const { return _imp->data; @@ -238,10 +238,10 @@ NamedSetDepSpec::name() const return _name; } -std::tr1::shared_ptr<DepSpec> +std::shared_ptr<DepSpec> NamedSetDepSpec::clone() const { - std::tr1::shared_ptr<NamedSetDepSpec> result(new NamedSetDepSpec(_name)); + std::shared_ptr<NamedSetDepSpec> result(new NamedSetDepSpec(_name)); result->set_annotations_key(annotations_key()); return result; } @@ -366,10 +366,10 @@ PlainTextDepSpec::PlainTextDepSpec(const std::string & s) : { } -std::tr1::shared_ptr<DepSpec> +std::shared_ptr<DepSpec> PlainTextDepSpec::clone() const { - std::tr1::shared_ptr<PlainTextDepSpec> result(new PlainTextDepSpec(text())); + std::shared_ptr<PlainTextDepSpec> result(new PlainTextDepSpec(text())); result->set_annotations_key(annotations_key()); return result; } @@ -388,10 +388,10 @@ PlainTextLabelDepSpec::~PlainTextLabelDepSpec() { } -std::tr1::shared_ptr<DepSpec> +std::shared_ptr<DepSpec> PlainTextLabelDepSpec::clone() const { - std::tr1::shared_ptr<PlainTextLabelDepSpec> result(new PlainTextLabelDepSpec(text())); + std::shared_ptr<PlainTextLabelDepSpec> result(new PlainTextLabelDepSpec(text())); result->set_annotations_key(annotations_key()); return result; } @@ -412,10 +412,10 @@ LicenseDepSpec::LicenseDepSpec(const std::string & s) : { } -std::tr1::shared_ptr<DepSpec> +std::shared_ptr<DepSpec> LicenseDepSpec::clone() const { - std::tr1::shared_ptr<LicenseDepSpec> result(new LicenseDepSpec(text())); + std::shared_ptr<LicenseDepSpec> result(new LicenseDepSpec(text())); result->set_annotations_key(annotations_key()); return result; } @@ -430,10 +430,10 @@ SimpleURIDepSpec::SimpleURIDepSpec(const std::string & s) : { } -std::tr1::shared_ptr<DepSpec> +std::shared_ptr<DepSpec> SimpleURIDepSpec::clone() const { - std::tr1::shared_ptr<SimpleURIDepSpec> result(new SimpleURIDepSpec(text())); + std::shared_ptr<SimpleURIDepSpec> result(new SimpleURIDepSpec(text())); result->set_annotations_key(annotations_key()); return result; } @@ -455,10 +455,10 @@ BlockDepSpec::strong() const return _strong; } -std::tr1::shared_ptr<DepSpec> +std::shared_ptr<DepSpec> BlockDepSpec::clone() const { - std::tr1::shared_ptr<BlockDepSpec> result(new BlockDepSpec(*this)); + std::shared_ptr<BlockDepSpec> result(new BlockDepSpec(*this)); result->set_annotations_key(annotations_key()); return result; } @@ -514,10 +514,10 @@ FetchableURIDepSpec::filename() const return orig.substr(p+1); } -std::tr1::shared_ptr<DepSpec> +std::shared_ptr<DepSpec> FetchableURIDepSpec::clone() const { - std::tr1::shared_ptr<FetchableURIDepSpec> result(new FetchableURIDepSpec(text())); + std::shared_ptr<FetchableURIDepSpec> result(new FetchableURIDepSpec(text())); result->set_annotations_key(annotations_key()); return result; } @@ -527,19 +527,19 @@ namespace paludis template <typename T_> struct Implementation<LabelsDepSpec<T_ > > { - std::list<std::tr1::shared_ptr<const T_> > items; + std::list<std::shared_ptr<const T_> > items; }; template <> struct WrappedForwardIteratorTraits<DependenciesLabelsDepSpec::ConstIteratorTag> { - typedef std::list<std::tr1::shared_ptr<const DependenciesLabel> >::const_iterator UnderlyingIterator; + typedef std::list<std::shared_ptr<const DependenciesLabel> >::const_iterator UnderlyingIterator; }; template <> struct WrappedForwardIteratorTraits<URILabelsDepSpec::ConstIteratorTag> { - typedef std::list<std::tr1::shared_ptr<const URILabel> >::const_iterator UnderlyingIterator; + typedef std::list<std::shared_ptr<const URILabel> >::const_iterator UnderlyingIterator; }; } @@ -556,13 +556,13 @@ LabelsDepSpec<T_>::~LabelsDepSpec() } template <typename T_> -std::tr1::shared_ptr<DepSpec> +std::shared_ptr<DepSpec> LabelsDepSpec<T_>::clone() const { - using namespace std::tr1::placeholders; - std::tr1::shared_ptr<LabelsDepSpec<T_> > my_clone(new LabelsDepSpec<T_>); + using namespace std::placeholders; + std::shared_ptr<LabelsDepSpec<T_> > my_clone(new LabelsDepSpec<T_>); my_clone->set_annotations_key(annotations_key()); - std::for_each(begin(), end(), std::tr1::bind(std::tr1::mem_fn(&LabelsDepSpec<T_>::add_label), my_clone.get(), _1)); + std::for_each(begin(), end(), std::bind(std::mem_fn(&LabelsDepSpec<T_>::add_label), my_clone.get(), _1)); return my_clone; } @@ -582,7 +582,7 @@ LabelsDepSpec<T_>::end() const template <typename T_> void -LabelsDepSpec<T_>::add_label(const std::tr1::shared_ptr<const T_> & item) +LabelsDepSpec<T_>::add_label(const std::shared_ptr<const T_> & item) { _imp->items.push_back(item); } @@ -602,10 +602,10 @@ namespace paludis template <> struct Implementation<PackageDepSpec> { - const std::tr1::shared_ptr<const PackageDepSpecData> data; - std::tr1::shared_ptr<const DepTag> tag; + const std::shared_ptr<const PackageDepSpecData> data; + std::shared_ptr<const DepTag> tag; - Implementation(const std::tr1::shared_ptr<const PackageDepSpecData> & d, const std::tr1::shared_ptr<const DepTag> & t) : + Implementation(const std::shared_ptr<const PackageDepSpecData> & d, const std::shared_ptr<const DepTag> & t) : data(d), tag(t) { @@ -613,10 +613,10 @@ namespace paludis }; } -PackageDepSpec::PackageDepSpec(const std::tr1::shared_ptr<const PackageDepSpecData> & d) : +PackageDepSpec::PackageDepSpec(const std::shared_ptr<const PackageDepSpecData> & d) : Cloneable<DepSpec>(), StringDepSpec(d->as_string()), - PrivateImplementationPattern<PackageDepSpec>(new Implementation<PackageDepSpec>(d, std::tr1::shared_ptr<const DepTag>())), + PrivateImplementationPattern<PackageDepSpec>(new Implementation<PackageDepSpec>(d, std::shared_ptr<const DepTag>())), _imp(PrivateImplementationPattern<PackageDepSpec>::_imp) { set_annotations_key(d->annotations_key()); @@ -636,25 +636,25 @@ PackageDepSpec::PackageDepSpec(const PackageDepSpec & d) : set_annotations_key(d.annotations_key()); } -std::tr1::shared_ptr<const QualifiedPackageName> +std::shared_ptr<const QualifiedPackageName> PackageDepSpec::package_ptr() const { return _imp->data->package_ptr(); } -std::tr1::shared_ptr<const PackageNamePart> +std::shared_ptr<const PackageNamePart> PackageDepSpec::package_name_part_ptr() const { return _imp->data->package_name_part_ptr(); } -std::tr1::shared_ptr<const CategoryNamePart> +std::shared_ptr<const CategoryNamePart> PackageDepSpec::category_name_part_ptr() const { return _imp->data->category_name_part_ptr(); } -std::tr1::shared_ptr<const VersionRequirements> +std::shared_ptr<const VersionRequirements> PackageDepSpec::version_requirements_ptr() const { return _imp->data->version_requirements_ptr(); @@ -666,56 +666,56 @@ PackageDepSpec::version_requirements_mode() const return _imp->data->version_requirements_mode(); } -std::tr1::shared_ptr<const SlotRequirement> +std::shared_ptr<const SlotRequirement> PackageDepSpec::slot_requirement_ptr() const { return _imp->data->slot_requirement_ptr(); } -std::tr1::shared_ptr<const RepositoryName> +std::shared_ptr<const RepositoryName> PackageDepSpec::in_repository_ptr() const { return _imp->data->in_repository_ptr(); } -std::tr1::shared_ptr<const InstallableToRepository> +std::shared_ptr<const InstallableToRepository> PackageDepSpec::installable_to_repository_ptr() const { return _imp->data->installable_to_repository_ptr(); } -std::tr1::shared_ptr<const RepositoryName> +std::shared_ptr<const RepositoryName> PackageDepSpec::from_repository_ptr() const { return _imp->data->from_repository_ptr(); } -std::tr1::shared_ptr<const FSEntry> +std::shared_ptr<const FSEntry> PackageDepSpec::installed_at_path_ptr() const { return _imp->data->installed_at_path_ptr(); } -std::tr1::shared_ptr<const InstallableToPath> +std::shared_ptr<const InstallableToPath> PackageDepSpec::installable_to_path_ptr() const { return _imp->data->installable_to_path_ptr(); } -std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> +std::shared_ptr<const AdditionalPackageDepSpecRequirements> PackageDepSpec::additional_requirements_ptr() const { return _imp->data->additional_requirements_ptr(); } -std::tr1::shared_ptr<const DepTag> +std::shared_ptr<const DepTag> PackageDepSpec::tag() const { return _imp->tag; } void -PackageDepSpec::set_tag(const std::tr1::shared_ptr<const DepTag> & s) +PackageDepSpec::set_tag(const std::shared_ptr<const DepTag> & s) { _imp->tag = s; } @@ -726,7 +726,7 @@ PackageDepSpec::_as_string() const return _imp->data->as_string(); } -std::tr1::shared_ptr<const PackageDepSpecData> +std::shared_ptr<const PackageDepSpecData> PackageDepSpec::data() const { return _imp->data; @@ -759,19 +759,19 @@ namespace struct PartiallyMadePackageDepSpecData : PackageDepSpecData { - std::tr1::shared_ptr<const QualifiedPackageName> package; - std::tr1::shared_ptr<const PackageNamePart> package_name_part; - std::tr1::shared_ptr<const CategoryNamePart> category_name_part; - std::tr1::shared_ptr<VersionRequirements> version_requirements; + std::shared_ptr<const QualifiedPackageName> package; + std::shared_ptr<const PackageNamePart> package_name_part; + std::shared_ptr<const CategoryNamePart> category_name_part; + std::shared_ptr<VersionRequirements> version_requirements; VersionRequirementsMode version_requirements_mode_v; - std::tr1::shared_ptr<const SlotRequirement> slot; - std::tr1::shared_ptr<const RepositoryName> in_repository; - std::tr1::shared_ptr<const RepositoryName> from_repository; - std::tr1::shared_ptr<const InstallableToRepository> installable_to_repository; - std::tr1::shared_ptr<const FSEntry> installed_at_path; - std::tr1::shared_ptr<const InstallableToPath> installable_to_path; - std::tr1::shared_ptr<AdditionalPackageDepSpecRequirements> additional_requirements; - std::tr1::shared_ptr<const MetadataSectionKey> annotations; + std::shared_ptr<const SlotRequirement> slot; + std::shared_ptr<const RepositoryName> in_repository; + std::shared_ptr<const RepositoryName> from_repository; + std::shared_ptr<const InstallableToRepository> installable_to_repository; + std::shared_ptr<const FSEntry> installed_at_path; + std::shared_ptr<const InstallableToPath> installable_to_path; + std::shared_ptr<AdditionalPackageDepSpecRequirements> additional_requirements; + std::shared_ptr<const MetadataSectionKey> annotations; PartiallyMadePackageDepSpecOptions options_for_partially_made_package_dep_spec_v; PartiallyMadePackageDepSpecData(const PartiallyMadePackageDepSpecOptions & o) : @@ -992,22 +992,22 @@ namespace return s.str(); } - virtual std::tr1::shared_ptr<const QualifiedPackageName> package_ptr() const + virtual std::shared_ptr<const QualifiedPackageName> package_ptr() const { return package; } - virtual std::tr1::shared_ptr<const PackageNamePart> package_name_part_ptr() const + virtual std::shared_ptr<const PackageNamePart> package_name_part_ptr() const { return package_name_part; } - virtual std::tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr() const + virtual std::shared_ptr<const CategoryNamePart> category_name_part_ptr() const { return category_name_part; } - virtual std::tr1::shared_ptr<const VersionRequirements> version_requirements_ptr() const + virtual std::shared_ptr<const VersionRequirements> version_requirements_ptr() const { return version_requirements; } @@ -1017,42 +1017,42 @@ namespace return version_requirements_mode_v; } - virtual std::tr1::shared_ptr<const SlotRequirement> slot_requirement_ptr() const + virtual std::shared_ptr<const SlotRequirement> slot_requirement_ptr() const { return slot; } - virtual std::tr1::shared_ptr<const RepositoryName> in_repository_ptr() const + virtual std::shared_ptr<const RepositoryName> in_repository_ptr() const { return in_repository; } - virtual std::tr1::shared_ptr<const InstallableToRepository> installable_to_repository_ptr() const + virtual std::shared_ptr<const InstallableToRepository> installable_to_repository_ptr() const { return installable_to_repository; } - virtual std::tr1::shared_ptr<const RepositoryName> from_repository_ptr() const + virtual std::shared_ptr<const RepositoryName> from_repository_ptr() const { return from_repository; } - virtual std::tr1::shared_ptr<const FSEntry> installed_at_path_ptr() const + virtual std::shared_ptr<const FSEntry> installed_at_path_ptr() const { return installed_at_path; } - virtual std::tr1::shared_ptr<const InstallableToPath> installable_to_path_ptr() const + virtual std::shared_ptr<const InstallableToPath> installable_to_path_ptr() const { return installable_to_path; } - virtual std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const + virtual std::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const { return additional_requirements; } - virtual std::tr1::shared_ptr<const MetadataSectionKey> annotations_key() const + virtual std::shared_ptr<const MetadataSectionKey> annotations_key() const { return annotations; } @@ -1069,7 +1069,7 @@ namespace paludis template <> struct Implementation<PartiallyMadePackageDepSpec> { - std::tr1::shared_ptr<PartiallyMadePackageDepSpecData> data; + std::shared_ptr<PartiallyMadePackageDepSpecData> data; Implementation(const PartiallyMadePackageDepSpecOptions & o) : data(new PartiallyMadePackageDepSpecData(o)) @@ -1115,7 +1115,7 @@ PartiallyMadePackageDepSpec::package(const QualifiedPackageName & name) } PartiallyMadePackageDepSpec & -PartiallyMadePackageDepSpec::slot_requirement(const std::tr1::shared_ptr<const SlotRequirement> & s) +PartiallyMadePackageDepSpec::slot_requirement(const std::shared_ptr<const SlotRequirement> & s) { _imp->data->slot = s; return *this; @@ -1187,7 +1187,7 @@ PartiallyMadePackageDepSpec::version_requirements_mode(const VersionRequirements } PartiallyMadePackageDepSpec & -PartiallyMadePackageDepSpec::additional_requirement(const std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> & req) +PartiallyMadePackageDepSpec::additional_requirement(const std::shared_ptr<const AdditionalPackageDepSpecRequirement> & req) { if (! _imp->data->additional_requirements) _imp->data->additional_requirements.reset(new AdditionalPackageDepSpecRequirements); @@ -1203,7 +1203,7 @@ PartiallyMadePackageDepSpec::clear_additional_requirements() } PartiallyMadePackageDepSpec & -PartiallyMadePackageDepSpec::annotations(const std::tr1::shared_ptr<const MetadataSectionKey> & a) +PartiallyMadePackageDepSpec::annotations(const std::shared_ptr<const MetadataSectionKey> & a) { _imp->data->annotations = a; return *this; @@ -1223,8 +1223,8 @@ PartiallyMadePackageDepSpec::to_package_dep_spec() const template class LabelsDepSpec<URILabel>; template class LabelsDepSpec<DependenciesLabel>; -template class Sequence<std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> >; -template class WrappedForwardIterator<AdditionalPackageDepSpecRequirements::ConstIteratorTag, const std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> >; +template class Sequence<std::shared_ptr<const AdditionalPackageDepSpecRequirement> >; +template class WrappedForwardIterator<AdditionalPackageDepSpecRequirements::ConstIteratorTag, const std::shared_ptr<const AdditionalPackageDepSpecRequirement> >; template class Cloneable<DepSpec>; template class PrivateImplementationPattern<ConditionalDepSpec>; @@ -1236,7 +1236,7 @@ template class PrivateImplementationPattern<URILabelsDepSpec>; template class PrivateImplementationPattern<DependenciesLabelsDepSpec>; template class WrappedForwardIterator<DependenciesLabelsDepSpec::ConstIteratorTag, - const std::tr1::shared_ptr<const DependenciesLabel> >; + const std::shared_ptr<const DependenciesLabel> >; template class WrappedForwardIterator<URILabelsDepSpec::ConstIteratorTag, - const std::tr1::shared_ptr<const URILabel> >; + const std::shared_ptr<const URILabel> >; diff --git a/paludis/dep_spec.hh b/paludis/dep_spec.hh index b744c3dd8..44b4ecea0 100644 --- a/paludis/dep_spec.hh +++ b/paludis/dep_spec.hh @@ -39,8 +39,8 @@ #include <paludis/package_id-fwd.hh> #include <paludis/environment-fwd.hh> -#include <tr1/memory> -#include <tr1/functional> +#include <memory> +#include <functional> /** \file * Declarations for dependency spec classes. @@ -90,13 +90,13 @@ namespace paludis /** * The annotations_key, if non-zero, contains any annotations. */ - const std::tr1::shared_ptr<const MetadataSectionKey> annotations_key() const + const std::shared_ptr<const MetadataSectionKey> annotations_key() const PALUDIS_ATTRIBUTE((warn_unused_result)); /** * Change the annotations key. */ - void set_annotations_key(const std::tr1::shared_ptr<const MetadataSectionKey> &); + void set_annotations_key(const std::shared_ptr<const MetadataSectionKey> &); ///\} }; @@ -121,7 +121,7 @@ namespace paludis ///\} - virtual std::tr1::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -145,7 +145,7 @@ namespace paludis ///\} - virtual std::tr1::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -176,7 +176,7 @@ namespace paludis ///\name Basic operations ///\{ - ConditionalDepSpec(const std::tr1::shared_ptr<const ConditionalDepSpecData> &); + ConditionalDepSpec(const std::shared_ptr<const ConditionalDepSpecData> &); ConditionalDepSpec(const ConditionalDepSpec &); ~ConditionalDepSpec(); @@ -202,7 +202,7 @@ namespace paludis * This shouldn't generally be used by clients, but some repositories use it * to gain access to additional data stored in the ConditionalDepSpecData. */ - const std::tr1::shared_ptr<const ConditionalDepSpecData> data() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const ConditionalDepSpecData> data() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -372,7 +372,7 @@ namespace paludis /** * Set our slot requirements, return ourself. */ - PartiallyMadePackageDepSpec & slot_requirement(const std::tr1::shared_ptr<const SlotRequirement> &); + PartiallyMadePackageDepSpec & slot_requirement(const std::shared_ptr<const SlotRequirement> &); /** * Set our in-repository requirement, return ourself. @@ -429,7 +429,7 @@ namespace paludis * Add an additional requirement, return ourself. */ PartiallyMadePackageDepSpec & additional_requirement( - const std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> &); + const std::shared_ptr<const AdditionalPackageDepSpecRequirement> &); /** * Clear additional requirements, return ourself. @@ -442,7 +442,7 @@ namespace paludis * Add annotations */ PartiallyMadePackageDepSpec & annotations( - const std::tr1::shared_ptr<const MetadataSectionKey> &); + const std::shared_ptr<const MetadataSectionKey> &); /** * Turn ourselves into a PackageDepSpec. @@ -502,7 +502,7 @@ namespace paludis * * \since 0.26 */ - PackageDepSpec(const std::tr1::shared_ptr<const PackageDepSpecData> &); + PackageDepSpec(const std::shared_ptr<const PackageDepSpecData> &); PackageDepSpec(const PackageDepSpec &); @@ -513,22 +513,22 @@ namespace paludis /** * Fetch the package name (may be a zero pointer). */ - std::tr1::shared_ptr<const QualifiedPackageName> package_ptr() const; + std::shared_ptr<const QualifiedPackageName> package_ptr() const; /** * Fetch the package name part, if wildcarded, or a zero pointer otherwise. */ - std::tr1::shared_ptr<const PackageNamePart> package_name_part_ptr() const; + std::shared_ptr<const PackageNamePart> package_name_part_ptr() const; /** * Fetch the category name part, if wildcarded, or a zero pointer otherwise. */ - std::tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr() const; + std::shared_ptr<const CategoryNamePart> category_name_part_ptr() const; /** * Fetch the version requirements (may be a zero pointer). */ - std::tr1::shared_ptr<const VersionRequirements> version_requirements_ptr() const; + std::shared_ptr<const VersionRequirements> version_requirements_ptr() const; /** * Fetch the version requirements mode. @@ -538,58 +538,58 @@ namespace paludis /** * Fetch the slot requirement (may be a zero pointer). */ - std::tr1::shared_ptr<const SlotRequirement> slot_requirement_ptr() const; + std::shared_ptr<const SlotRequirement> slot_requirement_ptr() const; /** * Fetch the in-repository requirement (may be a zero pointer). */ - std::tr1::shared_ptr<const RepositoryName> in_repository_ptr() const; + std::shared_ptr<const RepositoryName> in_repository_ptr() const; /** * Fetch the installable-to-repository requirement (may be a zero pointer). * * \since 0.32 */ - std::tr1::shared_ptr<const InstallableToRepository> installable_to_repository_ptr() const; + std::shared_ptr<const InstallableToRepository> installable_to_repository_ptr() const; /** * Fetch the from-repository requirement (may be a zero pointer). */ - std::tr1::shared_ptr<const RepositoryName> from_repository_ptr() const; + std::shared_ptr<const RepositoryName> from_repository_ptr() const; /** * Fetch the installed-at-path requirement (may be a zero pointer). * * \since 0.32 */ - std::tr1::shared_ptr<const FSEntry> installed_at_path_ptr() const; + std::shared_ptr<const FSEntry> installed_at_path_ptr() const; /** * Fetch the installable-to-path requirement (may be a zero pointer). * * \since 0.32 */ - std::tr1::shared_ptr<const InstallableToPath> installable_to_path_ptr() const; + std::shared_ptr<const InstallableToPath> installable_to_path_ptr() const; /** * Fetch any additional requirements (may be a zero pointer). */ - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const; + std::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const; /** * Fetch our tag. */ - std::tr1::shared_ptr<const DepTag> tag() const; + std::shared_ptr<const DepTag> tag() const; /** * Set our tag. */ - void set_tag(const std::tr1::shared_ptr<const DepTag> & s); + void set_tag(const std::shared_ptr<const DepTag> & s); /** * Access to our data. */ - std::tr1::shared_ptr<const PackageDepSpecData> data() const; + std::shared_ptr<const PackageDepSpecData> data() const; }; /** @@ -616,22 +616,22 @@ namespace paludis /** * Fetch the package name (may be a zero pointer). */ - virtual std::tr1::shared_ptr<const QualifiedPackageName> package_ptr() const = 0; + virtual std::shared_ptr<const QualifiedPackageName> package_ptr() const = 0; /** * Fetch the package name part, if wildcarded, or a zero pointer otherwise. */ - virtual std::tr1::shared_ptr<const PackageNamePart> package_name_part_ptr() const = 0; + virtual std::shared_ptr<const PackageNamePart> package_name_part_ptr() const = 0; /** * Fetch the category name part, if wildcarded, or a zero pointer otherwise. */ - virtual std::tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr() const = 0; + virtual std::shared_ptr<const CategoryNamePart> category_name_part_ptr() const = 0; /** * Fetch the version requirements (may be a zero pointer). */ - virtual std::tr1::shared_ptr<const VersionRequirements> version_requirements_ptr() const = 0; + virtual std::shared_ptr<const VersionRequirements> version_requirements_ptr() const = 0; /** * Fetch the version requirements mode. @@ -641,48 +641,48 @@ namespace paludis /** * Fetch the slot name (may be a zero pointer). */ - virtual std::tr1::shared_ptr<const SlotRequirement> slot_requirement_ptr() const = 0; + virtual std::shared_ptr<const SlotRequirement> slot_requirement_ptr() const = 0; /** * Fetch the from-repository requirement (may be a zero pointer). */ - virtual std::tr1::shared_ptr<const RepositoryName> in_repository_ptr() const = 0; + virtual std::shared_ptr<const RepositoryName> in_repository_ptr() const = 0; /** * Fetch the installable-to-repository requirement (may be a zero pointer). * * \since 0.32 */ - virtual std::tr1::shared_ptr<const InstallableToRepository> installable_to_repository_ptr() const = 0; + virtual std::shared_ptr<const InstallableToRepository> installable_to_repository_ptr() const = 0; /** * Fetch the from-repository requirement (may be a zero pointer). */ - virtual std::tr1::shared_ptr<const RepositoryName> from_repository_ptr() const = 0; + virtual std::shared_ptr<const RepositoryName> from_repository_ptr() const = 0; /** * Fetch the installed-at-path requirement (may be a zero pointer). * * \since 0.32 */ - virtual std::tr1::shared_ptr<const FSEntry> installed_at_path_ptr() const = 0; + virtual std::shared_ptr<const FSEntry> installed_at_path_ptr() const = 0; /** * Fetch the installable-to-path requirement (may be a zero pointer). * * \since 0.32 */ - virtual std::tr1::shared_ptr<const InstallableToPath> installable_to_path_ptr() const = 0; + virtual std::shared_ptr<const InstallableToPath> installable_to_path_ptr() const = 0; /** * Fetch the additional requirements (may be a zero pointer). */ - virtual std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const = 0; + virtual std::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const = 0; /** * Fetch the annotations (may be a zero pointer). */ - virtual std::tr1::shared_ptr<const MetadataSectionKey> annotations_key() const = 0; + virtual std::shared_ptr<const MetadataSectionKey> annotations_key() const = 0; /** * Fetch options if we're being used to construct a new PartiallyMadePackageDepSpec. @@ -712,7 +712,7 @@ namespace paludis ///\} - virtual std::tr1::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -741,7 +741,7 @@ namespace paludis /// Fetch the name of our set. const SetName name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::tr1::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -765,7 +765,7 @@ namespace paludis ///\} - virtual std::tr1::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -811,7 +811,7 @@ namespace paludis */ std::string filename() const; - virtual std::tr1::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -837,7 +837,7 @@ namespace paludis ///\} - virtual std::tr1::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -904,7 +904,7 @@ namespace paludis */ bool strong() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::tr1::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -940,18 +940,18 @@ namespace paludis ///\name Contained labels ///\{ - void add_label(const std::tr1::shared_ptr<const Labels_> &); + void add_label(const std::shared_ptr<const Labels_> &); struct ConstIteratorTag; typedef WrappedForwardIterator<ConstIteratorTag, - const std::tr1::shared_ptr<const Labels_> > ConstIterator; + const std::shared_ptr<const Labels_> > ConstIterator; ConstIterator begin() const PALUDIS_ATTRIBUTE((warn_unused_result)); ConstIterator end() const PALUDIS_ATTRIBUTE((warn_unused_result)); ///\} - virtual std::tr1::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE PlainTextLabelDepSpec : @@ -969,7 +969,7 @@ namespace paludis ///\} - virtual std::tr1::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); const std::string label() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -985,9 +985,9 @@ namespace paludis extern template class PrivateImplementationPattern<PlainTextLabelDepSpec>; extern template class WrappedForwardIterator<DependenciesLabelsDepSpec::ConstIteratorTag, - const std::tr1::shared_ptr<const DependenciesLabel> >; + const std::shared_ptr<const DependenciesLabel> >; extern template class WrappedForwardIterator<URILabelsDepSpec::ConstIteratorTag, - const std::tr1::shared_ptr<const URILabel> >; + const std::shared_ptr<const URILabel> >; } diff --git a/paludis/dep_spec_TEST.cc b/paludis/dep_spec_TEST.cc index 091eb00d1..074da1006 100644 --- a/paludis/dep_spec_TEST.cc +++ b/paludis/dep_spec_TEST.cc @@ -66,14 +66,14 @@ namespace test_cases PackageDepSpec a(parse_user_package_dep_spec("cat/pkg:1::repo[=1|>3.2][foo]", &env, UserPackageDepSpecOptions())); - std::tr1::shared_ptr<PackageDepSpec> b(std::tr1::static_pointer_cast<PackageDepSpec>(a.clone())); + std::shared_ptr<PackageDepSpec> b(std::static_pointer_cast<PackageDepSpec>(a.clone())); TEST_CHECK_STRINGIFY_EQUAL(a, *b); - std::tr1::shared_ptr<PackageDepSpec> c(std::tr1::static_pointer_cast<PackageDepSpec>(a.clone())); + std::shared_ptr<PackageDepSpec> c(std::static_pointer_cast<PackageDepSpec>(a.clone())); TEST_CHECK_STRINGIFY_EQUAL(a, *c); BlockDepSpec d("!" + stringify(*c), *c, false); - std::tr1::shared_ptr<BlockDepSpec> e(std::tr1::static_pointer_cast<BlockDepSpec>(d.clone())); + std::shared_ptr<BlockDepSpec> e(std::static_pointer_cast<BlockDepSpec>(d.clone())); TEST_CHECK_STRINGIFY_EQUAL(d.blocking(), e->blocking()); } } test_dep_spec_clone; diff --git a/paludis/dep_spec_flattener.cc b/paludis/dep_spec_flattener.cc index 89fe9fb76..6dc9211e3 100644 --- a/paludis/dep_spec_flattener.cc +++ b/paludis/dep_spec_flattener.cc @@ -40,7 +40,7 @@ namespace paludis { const Environment * const env; - std::list<std::tr1::shared_ptr<const Item_> > specs; + std::list<std::shared_ptr<const Item_> > specs; std::set<SetName> recursing_sets; Implementation(const Environment * const e) : @@ -52,25 +52,25 @@ namespace paludis template <> struct WrappedForwardIteratorTraits<DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIteratorTag> { - typedef std::list<std::tr1::shared_ptr<const PackageDepSpec> >::const_iterator UnderlyingIterator; + typedef std::list<std::shared_ptr<const PackageDepSpec> >::const_iterator UnderlyingIterator; }; template <> struct WrappedForwardIteratorTraits<DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>::ConstIteratorTag> { - typedef std::list<std::tr1::shared_ptr<const PlainTextDepSpec> >::const_iterator UnderlyingIterator; + typedef std::list<std::shared_ptr<const PlainTextDepSpec> >::const_iterator UnderlyingIterator; }; template <> struct WrappedForwardIteratorTraits<DepSpecFlattener<SetSpecTree, PackageDepSpec>::ConstIteratorTag> { - typedef std::list<std::tr1::shared_ptr<const PackageDepSpec> >::const_iterator UnderlyingIterator; + typedef std::list<std::shared_ptr<const PackageDepSpec> >::const_iterator UnderlyingIterator; }; template <> struct WrappedForwardIteratorTraits<DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec>::ConstIteratorTag> { - typedef std::list<std::tr1::shared_ptr<const SimpleURIDepSpec> >::const_iterator UnderlyingIterator; + typedef std::list<std::shared_ptr<const SimpleURIDepSpec> >::const_iterator UnderlyingIterator; }; } @@ -252,7 +252,7 @@ DepSpecFlattener<Heirarchy_, Item_>::handle_named_set(const NamedSetDepSpec & sp if (! _imp->recursing_sets.insert(spec.name()).second) throw RecursivelyDefinedSetError(stringify(spec.name())); - std::tr1::shared_ptr<const SetSpecTree> set(_imp->env->set(spec.name())); + std::shared_ptr<const SetSpecTree> set(_imp->env->set(spec.name())); if (! set) throw NoSuchSetError(stringify(spec.name())); @@ -265,7 +265,7 @@ template <typename Heirarchy_, typename Item_> void DepSpecFlattener<Heirarchy_, Item_>::handle_item(const Item_ & spec) { - _imp->specs.push_back(std::tr1::static_pointer_cast<const Item_>(spec.clone())); + _imp->specs.push_back(std::static_pointer_cast<const Item_>(spec.clone())); } template class DepSpecFlattener<ProvideSpecTree, PackageDepSpec>; @@ -274,11 +274,11 @@ template class DepSpecFlattener<SetSpecTree, PackageDepSpec>; template class DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec>; template class WrappedForwardIterator<DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIteratorTag, - const std::tr1::shared_ptr<const PackageDepSpec> >; + const std::shared_ptr<const PackageDepSpec> >; template class WrappedForwardIterator<DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>::ConstIteratorTag, - const std::tr1::shared_ptr<const PlainTextDepSpec> >; + const std::shared_ptr<const PlainTextDepSpec> >; template class WrappedForwardIterator<DepSpecFlattener<SetSpecTree, PackageDepSpec>::ConstIteratorTag, - const std::tr1::shared_ptr<const PackageDepSpec> >; + const std::shared_ptr<const PackageDepSpec> >; template class WrappedForwardIterator<DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec>::ConstIteratorTag, - const std::tr1::shared_ptr<const SimpleURIDepSpec> >; + const std::shared_ptr<const SimpleURIDepSpec> >; diff --git a/paludis/dep_spec_flattener.hh b/paludis/dep_spec_flattener.hh index 1fdca5615..1c13d432e 100644 --- a/paludis/dep_spec_flattener.hh +++ b/paludis/dep_spec_flattener.hh @@ -28,7 +28,7 @@ #include <paludis/util/private_implementation_pattern.hh> #include <paludis/util/no_type.hh> #include <paludis/util/wrapped_forward_iterator.hh> -#include <tr1/memory> +#include <memory> /** \file * Declarations for DepSpecFlattener. @@ -107,7 +107,7 @@ namespace paludis ///\{ struct ConstIteratorTag; - typedef WrappedForwardIterator<ConstIteratorTag, const std::tr1::shared_ptr<const Item_> > ConstIterator; + typedef WrappedForwardIterator<ConstIteratorTag, const std::shared_ptr<const Item_> > ConstIterator; ConstIterator begin() const; ConstIterator end() const; @@ -121,13 +121,13 @@ namespace paludis extern template class DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec>; extern template class WrappedForwardIterator<DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIteratorTag, - const std::tr1::shared_ptr<const PackageDepSpec> >; + const std::shared_ptr<const PackageDepSpec> >; extern template class WrappedForwardIterator<DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>::ConstIteratorTag, - const std::tr1::shared_ptr<const PlainTextDepSpec> >; + const std::shared_ptr<const PlainTextDepSpec> >; extern template class WrappedForwardIterator<DepSpecFlattener<SetSpecTree, PackageDepSpec>::ConstIteratorTag, - const std::tr1::shared_ptr<const PackageDepSpec> >; + const std::shared_ptr<const PackageDepSpec> >; extern template class WrappedForwardIterator<DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec>::ConstIteratorTag, - const std::tr1::shared_ptr<const SimpleURIDepSpec> >; + const std::shared_ptr<const SimpleURIDepSpec> >; } #endif diff --git a/paludis/dep_tag.cc b/paludis/dep_tag.cc index 3ccb7332b..5507af8a1 100644 --- a/paludis/dep_tag.cc +++ b/paludis/dep_tag.cc @@ -43,10 +43,10 @@ template class PrivateImplementationPattern<DependencyDepTag>; namespace { - std::tr1::shared_ptr<DepTagCategory> + std::shared_ptr<DepTagCategory> make_glsa_dep_tag() { - return std::tr1::shared_ptr<DepTagCategory>(new DepTagCategory( + return std::shared_ptr<DepTagCategory>(new DepTagCategory( true, "glsa", "Security advisories", @@ -54,10 +54,10 @@ namespace "Please read the advisories carefully and take appropriate action.")); } - std::tr1::shared_ptr<DepTagCategory> + std::shared_ptr<DepTagCategory> make_general_set_dep_tag() { - return std::tr1::shared_ptr<DepTagCategory>(new DepTagCategory( + return std::shared_ptr<DepTagCategory>(new DepTagCategory( true, "general", "General sets", @@ -65,10 +65,10 @@ namespace "")); } - std::tr1::shared_ptr<DepTagCategory> + std::shared_ptr<DepTagCategory> make_dependency_set_dep_tag() { - return std::tr1::shared_ptr<DepTagCategory>(new DepTagCategory( + return std::shared_ptr<DepTagCategory>(new DepTagCategory( false, "dependency", "Dependencies", @@ -76,10 +76,10 @@ namespace "")); } - std::tr1::shared_ptr<DepTagCategory> + std::shared_ptr<DepTagCategory> make_target_dep_tag() { - return std::tr1::shared_ptr<DepTagCategory>(new DepTagCategory( + return std::shared_ptr<DepTagCategory>(new DepTagCategory( false, "target", "Targets", @@ -271,19 +271,19 @@ namespace paludis mutable Mutex mutex; mutable std::string str; - std::tr1::shared_ptr<const PackageID> id; - const std::tr1::shared_ptr<PackageDepSpec> spec; + std::shared_ptr<const PackageID> id; + const std::shared_ptr<PackageDepSpec> spec; - Implementation(const std::tr1::shared_ptr<const PackageID> & i, const PackageDepSpec & d) : + Implementation(const std::shared_ptr<const PackageID> & i, const PackageDepSpec & d) : id(i), - spec(std::tr1::static_pointer_cast<PackageDepSpec>(d.clone())) + spec(std::static_pointer_cast<PackageDepSpec>(d.clone())) { - spec->set_tag(std::tr1::shared_ptr<const DepTag>()); + spec->set_tag(std::shared_ptr<const DepTag>()); } }; } -DependencyDepTag::DependencyDepTag(const std::tr1::shared_ptr<const PackageID> & i, const PackageDepSpec & d) : +DependencyDepTag::DependencyDepTag(const std::shared_ptr<const PackageID> & i, const PackageDepSpec & d) : PrivateImplementationPattern<DependencyDepTag>(new Implementation<DependencyDepTag>(i, d)) { } @@ -304,13 +304,13 @@ DependencyDepTag::category() const return "dependency"; } -const std::tr1::shared_ptr<const PackageID> +const std::shared_ptr<const PackageID> DependencyDepTag::package_id() const { return _imp->id; } -const std::tr1::shared_ptr<const PackageDepSpec> +const std::shared_ptr<const PackageDepSpec> DependencyDepTag::dependency() const { return _imp->spec; @@ -340,7 +340,7 @@ DepTagCategoryFactory::DepTagCategoryFactory() { } -const std::tr1::shared_ptr<DepTagCategory> +const std::shared_ptr<DepTagCategory> DepTagCategoryFactory::create(const std::string & s) const { if (s == "glsa") diff --git a/paludis/dep_tag.hh b/paludis/dep_tag.hh index 48f58bcc1..9adc71708 100644 --- a/paludis/dep_tag.hh +++ b/paludis/dep_tag.hh @@ -46,7 +46,7 @@ #include <paludis/util/singleton.hh> #include <string> -#include <tr1/memory> +#include <memory> namespace paludis { @@ -135,7 +135,7 @@ namespace paludis DepTagCategoryFactory(); public: - const std::tr1::shared_ptr<DepTagCategory> create(const std::string &) const + const std::shared_ptr<DepTagCategory> create(const std::string &) const PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -281,7 +281,7 @@ namespace paludis ///\name Basic operations ///\{ - DependencyDepTag(const std::tr1::shared_ptr<const PackageID> &, const PackageDepSpec &); + DependencyDepTag(const std::shared_ptr<const PackageID> &, const PackageDepSpec &); ~DependencyDepTag(); @@ -294,12 +294,12 @@ namespace paludis /** * The PackageID that contains our dependency. */ - const std::tr1::shared_ptr<const PackageID> package_id() const; + const std::shared_ptr<const PackageID> package_id() const; /** * The PackageDepSpec that pulled us in. */ - const std::tr1::shared_ptr<const PackageDepSpec> dependency() const; + const std::shared_ptr<const PackageDepSpec> dependency() const; }; /** @@ -338,7 +338,7 @@ namespace paludis struct DepTagEntry { NamedValue<n::generation, long> generation; - NamedValue<n::tag, std::tr1::shared_ptr<const DepTag> > tag; + NamedValue<n::tag, std::shared_ptr<const DepTag> > tag; }; /** diff --git a/paludis/distribution-impl.hh b/paludis/distribution-impl.hh index 9034367ba..aa9dfc61c 100644 --- a/paludis/distribution-impl.hh +++ b/paludis/distribution-impl.hh @@ -26,7 +26,7 @@ #include <paludis/util/config_file.hh> #include <paludis/util/options.hh> #include <paludis/util/private_implementation_pattern-impl.hh> -#include <tr1/unordered_map> +#include <unordered_map> namespace paludis { @@ -34,7 +34,7 @@ namespace paludis struct Implementation<ExtraDistributionData<Data_> > { mutable Mutex mutex; - mutable std::tr1::unordered_map<std::string, std::tr1::shared_ptr<const Data_>, Hash<std::string> > values; + mutable std::unordered_map<std::string, std::shared_ptr<const Data_>, Hash<std::string> > values; }; template <typename Data_> @@ -52,18 +52,18 @@ namespace paludis struct ExtraDistributionDataData; template <typename Data_> - const std::tr1::shared_ptr<const Data_> + const std::shared_ptr<const Data_> ExtraDistributionData<Data_>::data_from_distribution(const Distribution & d) const { Lock lock(this->_imp->mutex); - typename std::tr1::unordered_map<std::string, std::tr1::shared_ptr<const Data_>, Hash<std::string> >::const_iterator v( + typename std::unordered_map<std::string, std::shared_ptr<const Data_>, Hash<std::string> >::const_iterator v( this->_imp->values.find(d.name())); if (this->_imp->values.end() != v) return v->second; - std::tr1::shared_ptr<KeyValueConfigFile> k(new KeyValueConfigFile(d.extra_data_dir() / ExtraDistributionDataData<Data_>::config_file_name(), + std::shared_ptr<KeyValueConfigFile> k(new KeyValueConfigFile(d.extra_data_dir() / ExtraDistributionDataData<Data_>::config_file_name(), KeyValueConfigFileOptions(), &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)); - std::tr1::shared_ptr<const Data_> data(ExtraDistributionDataData<Data_>::make_data(k)); + std::shared_ptr<const Data_> data(ExtraDistributionDataData<Data_>::make_data(k)); this->_imp->values.insert(std::make_pair(d.name(), data)); return data; } diff --git a/paludis/distribution.cc b/paludis/distribution.cc index d21faa91a..edced97cb 100644 --- a/paludis/distribution.cc +++ b/paludis/distribution.cc @@ -21,17 +21,16 @@ #include <paludis/util/config_file.hh> #include <paludis/util/destringify.hh> #include <paludis/util/dir_iterator.hh> +#include <paludis/util/hashes.hh> #include <paludis/util/is_file_with_extension.hh> -#include <paludis/util/system.hh> +#include <paludis/util/make_named_values.hh> #include <paludis/util/make_shared_ptr.hh> -#include <paludis/util/strip.hh> -#include <paludis/util/singleton-impl.hh> -#include <paludis/util/stringify.hh> #include <paludis/util/private_implementation_pattern-impl.hh> -#include <paludis/util/hashes.hh> -#include <paludis/util/make_named_values.hh> #include <paludis/util/singleton-impl.hh> -#include <tr1/unordered_map> +#include <paludis/util/stringify.hh> +#include <paludis/util/strip.hh> +#include <paludis/util/system.hh> +#include <unordered_map> using namespace paludis; @@ -42,7 +41,7 @@ DistributionConfigurationError::DistributionConfigurationError(const std::string { } -typedef std::tr1::unordered_map<std::string, std::tr1::shared_ptr<const Distribution>, Hash<std::string> > DistributionHash; +typedef std::unordered_map<std::string, std::shared_ptr<const Distribution>, Hash<std::string> > DistributionHash; namespace paludis { @@ -91,7 +90,7 @@ DistributionData::~DistributionData() { } -std::tr1::shared_ptr<const Distribution> +std::shared_ptr<const Distribution> DistributionData::distribution_from_string(const std::string & s) const { DistributionHash::const_iterator i(_imp->values.find(s)); diff --git a/paludis/distribution.hh b/paludis/distribution.hh index 00b2c1e06..3d04843f6 100644 --- a/paludis/distribution.hh +++ b/paludis/distribution.hh @@ -27,7 +27,7 @@ #include <paludis/util/named_value.hh> #include <paludis/util/fs_entry.hh> #include <paludis/util/singleton.hh> -#include <tr1/memory> +#include <memory> /** \file * Declarations for distributions. @@ -126,7 +126,7 @@ namespace paludis /** * Fetch a distribution from a named string. */ - std::tr1::shared_ptr<const Distribution> distribution_from_string(const std::string &) const; + std::shared_ptr<const Distribution> distribution_from_string(const std::string &) const; }; /** @@ -153,7 +153,7 @@ namespace paludis /** * Fetch our data from a given distribution. */ - const std::tr1::shared_ptr<const Data_> data_from_distribution( + const std::shared_ptr<const Data_> data_from_distribution( const Distribution &) const PALUDIS_ATTRIBUTE((warn_unused_result)); }; diff --git a/paludis/elf_linkage_checker.cc b/paludis/elf_linkage_checker.cc index 4f1bea50c..3492d89c1 100644 --- a/paludis/elf_linkage_checker.cc +++ b/paludis/elf_linkage_checker.cc @@ -230,7 +230,7 @@ Implementation<ElfLinkageChecker>::handle_library(const FSEntry & file, const El ll_debug, lc_context) << "Known symlinks are " << join(second_iterator(range.first), second_iterator(range.second), " "); std::transform(second_iterator(range.first), second_iterator(range.second), - std::back_inserter(libraries[arch]), std::tr1::mem_fn(&FSEntry::basename)); + std::back_inserter(libraries[arch]), std::mem_fn(&FSEntry::basename)); } } @@ -261,9 +261,9 @@ ElfLinkageChecker::add_extra_lib_dir(const FSEntry & dir) void ElfLinkageChecker::need_breakage_added( - const std::tr1::function<void (const FSEntry &, const std::string &)> & callback) + const std::function<void (const FSEntry &, const std::string &)> & callback) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; typedef std::map<std::string, std::set<ElfArchitecture> > AllMissing; AllMissing all_missing; @@ -331,7 +331,7 @@ ElfLinkageChecker::need_breakage_added( arch_it_end(missing_it->second.end()); arch_it_end != arch_it; ++arch_it) std::for_each(_imp->needed[*arch_it][missing_it->first].begin(), _imp->needed[*arch_it][missing_it->first].end(), - std::tr1::bind(callback, _1, missing_it->first)); + std::bind(callback, _1, missing_it->first)); } diff --git a/paludis/elf_linkage_checker.hh b/paludis/elf_linkage_checker.hh index 13b755c29..1dc22d71c 100644 --- a/paludis/elf_linkage_checker.hh +++ b/paludis/elf_linkage_checker.hh @@ -22,7 +22,7 @@ #include <paludis/linkage_checker.hh> #include <paludis/util/private_implementation_pattern.hh> -#include <tr1/functional> +#include <functional> #include <iosfwd> namespace paludis @@ -40,7 +40,7 @@ namespace paludis virtual void add_extra_lib_dir(const paludis::FSEntry &); virtual void need_breakage_added( - const std::tr1::function<void (const paludis::FSEntry &, const std::string &)> &); + const std::function<void (const paludis::FSEntry &, const std::string &)> &); }; } diff --git a/paludis/elike_annotations.cc b/paludis/elike_annotations.cc index 7b9bbe514..8e16c8213 100644 --- a/paludis/elike_annotations.cc +++ b/paludis/elike_annotations.cc @@ -33,7 +33,7 @@ namespace paludis }; } -ELikeAnnotations::ELikeAnnotations(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m) : +ELikeAnnotations::ELikeAnnotations(const std::shared_ptr<const Map<std::string, std::string> > & m) : PrivateImplementationPattern<ELikeAnnotations>(new Implementation<ELikeAnnotations>) { for (Map<std::string, std::string>::ConstIterator k(m->begin()), k_end(m->end()) ; diff --git a/paludis/elike_annotations.hh b/paludis/elike_annotations.hh index e10cb5cee..2636ae65f 100644 --- a/paludis/elike_annotations.hh +++ b/paludis/elike_annotations.hh @@ -24,7 +24,7 @@ #include <paludis/util/private_implementation_pattern.hh> #include <paludis/util/map-fwd.hh> #include <paludis/metadata_key.hh> -#include <tr1/memory> +#include <memory> namespace paludis { @@ -33,7 +33,7 @@ namespace paludis public MetadataSectionKey { public: - ELikeAnnotations(const std::tr1::shared_ptr<const Map<std::string, std::string> > &); + ELikeAnnotations(const std::shared_ptr<const Map<std::string, std::string> > &); ~ELikeAnnotations(); void need_keys_added() const; diff --git a/paludis/elike_choices.cc b/paludis/elike_choices.cc index 7d7ca11c6..f53767930 100644 --- a/paludis/elike_choices.cc +++ b/paludis/elike_choices.cc @@ -38,8 +38,8 @@ ELikeStripChoiceValue::canonical_name_with_prefix() return ChoiceNameWithPrefix(stringify(canonical_build_options_prefix()) + ":" + stringify(canonical_unprefixed_name())); } -ELikeStripChoiceValue::ELikeStripChoiceValue(const std::tr1::shared_ptr<const PackageID> & id, - const Environment * const env, const std::tr1::shared_ptr<const Choice> & choice) : +ELikeStripChoiceValue::ELikeStripChoiceValue(const std::shared_ptr<const PackageID> & id, + const Environment * const env, const std::shared_ptr<const Choice> & choice) : _enabled(! env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_false()) { } @@ -104,8 +104,8 @@ ELikeSplitChoiceValue::canonical_name_with_prefix() return ChoiceNameWithPrefix(stringify(canonical_build_options_prefix()) + ":" + stringify(canonical_unprefixed_name())); } -ELikeSplitChoiceValue::ELikeSplitChoiceValue(const std::tr1::shared_ptr<const PackageID> & id, - const Environment * const env, const std::tr1::shared_ptr<const Choice> & choice) : +ELikeSplitChoiceValue::ELikeSplitChoiceValue(const std::shared_ptr<const PackageID> & id, + const Environment * const env, const std::shared_ptr<const Choice> & choice) : _enabled(! env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_false()) { } @@ -170,8 +170,8 @@ ELikeOptionalTestsChoiceValue::canonical_name_with_prefix() return ChoiceNameWithPrefix(stringify(canonical_build_options_prefix()) + ":" + stringify(canonical_unprefixed_name())); } -ELikeOptionalTestsChoiceValue::ELikeOptionalTestsChoiceValue(const std::tr1::shared_ptr<const PackageID> & id, - const Environment * const env, const std::tr1::shared_ptr<const Choice> & choice) : +ELikeOptionalTestsChoiceValue::ELikeOptionalTestsChoiceValue(const std::shared_ptr<const PackageID> & id, + const Environment * const env, const std::shared_ptr<const Choice> & choice) : _enabled(env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_true()) { } @@ -236,8 +236,8 @@ ELikeRecommendedTestsChoiceValue::canonical_name_with_prefix() return ChoiceNameWithPrefix(stringify(canonical_build_options_prefix()) + ":" + stringify(canonical_unprefixed_name())); } -ELikeRecommendedTestsChoiceValue::ELikeRecommendedTestsChoiceValue(const std::tr1::shared_ptr<const PackageID> & id, - const Environment * const env, const std::tr1::shared_ptr<const Choice> & choice) : +ELikeRecommendedTestsChoiceValue::ELikeRecommendedTestsChoiceValue(const std::shared_ptr<const PackageID> & id, + const Environment * const env, const std::shared_ptr<const Choice> & choice) : _enabled(! env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_false()) { } @@ -320,8 +320,8 @@ ELikeExpensiveTestsChoiceValue::canonical_name_with_prefix() return ChoiceNameWithPrefix(stringify(canonical_build_options_prefix()) + ":" + stringify(canonical_unprefixed_name())); } -ELikeExpensiveTestsChoiceValue::ELikeExpensiveTestsChoiceValue(const std::tr1::shared_ptr<const PackageID> & id, - const Environment * const env, const std::tr1::shared_ptr<const Choice> & choice) : +ELikeExpensiveTestsChoiceValue::ELikeExpensiveTestsChoiceValue(const std::shared_ptr<const PackageID> & id, + const Environment * const env, const std::shared_ptr<const Choice> & choice) : _enabled(env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_true()) { } @@ -388,7 +388,7 @@ ELikeJobsChoiceValue::canonical_name_with_prefix() namespace { - std::string get_jobs(const std::tr1::shared_ptr<const PackageID> & id, + std::string get_jobs(const std::shared_ptr<const PackageID> & id, const std::string & env_value) { if (env_value.empty()) @@ -408,8 +408,8 @@ namespace } } -ELikeJobsChoiceValue::ELikeJobsChoiceValue(const std::tr1::shared_ptr<const PackageID> & id, - const Environment * const env, const std::tr1::shared_ptr<const Choice> & choice) : +ELikeJobsChoiceValue::ELikeJobsChoiceValue(const std::shared_ptr<const PackageID> & id, + const Environment * const env, const std::shared_ptr<const Choice> & choice) : _enabled(env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_true()), _parameter(get_jobs(id, env->value_for_choice_parameter(id, choice, canonical_unprefixed_name()))) { @@ -477,8 +477,8 @@ ELikeTraceChoiceValue::canonical_name_with_prefix() stringify(canonical_unprefixed_name())); } -ELikeTraceChoiceValue::ELikeTraceChoiceValue(const std::tr1::shared_ptr<const PackageID> & id, - const Environment * const env, const std::tr1::shared_ptr<const Choice> & choice) : +ELikeTraceChoiceValue::ELikeTraceChoiceValue(const std::shared_ptr<const PackageID> & id, + const Environment * const env, const std::shared_ptr<const Choice> & choice) : _enabled(env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_true()) { } @@ -544,8 +544,8 @@ ELikePreserveWorkChoiceValue::canonical_name_with_prefix() stringify(canonical_unprefixed_name())); } -ELikePreserveWorkChoiceValue::ELikePreserveWorkChoiceValue(const std::tr1::shared_ptr<const PackageID> & id, - const Environment * const env, const std::tr1::shared_ptr<const Choice> & choice, +ELikePreserveWorkChoiceValue::ELikePreserveWorkChoiceValue(const std::shared_ptr<const PackageID> & id, + const Environment * const env, const std::shared_ptr<const Choice> & choice, const bool by_default) : _enabled(by_default ? ! env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_false() : diff --git a/paludis/elike_choices.hh b/paludis/elike_choices.hh index 7a8d3f219..6b551eb93 100644 --- a/paludis/elike_choices.hh +++ b/paludis/elike_choices.hh @@ -35,8 +35,8 @@ namespace paludis const bool _enabled; public: - ELikeStripChoiceValue(const std::tr1::shared_ptr<const PackageID> &, - const Environment * const env, const std::tr1::shared_ptr<const Choice> &); + ELikeStripChoiceValue(const std::shared_ptr<const PackageID> &, + const Environment * const env, const std::shared_ptr<const Choice> &); virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -58,8 +58,8 @@ namespace paludis const bool _enabled; public: - ELikeSplitChoiceValue(const std::tr1::shared_ptr<const PackageID> &, - const Environment * const env, const std::tr1::shared_ptr<const Choice> &); + ELikeSplitChoiceValue(const std::shared_ptr<const PackageID> &, + const Environment * const env, const std::shared_ptr<const Choice> &); virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -81,8 +81,8 @@ namespace paludis const bool _enabled; public: - ELikeOptionalTestsChoiceValue(const std::tr1::shared_ptr<const PackageID> &, - const Environment * const env, const std::tr1::shared_ptr<const Choice> &); + ELikeOptionalTestsChoiceValue(const std::shared_ptr<const PackageID> &, + const Environment * const env, const std::shared_ptr<const Choice> &); virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -104,8 +104,8 @@ namespace paludis const bool _enabled; public: - ELikeRecommendedTestsChoiceValue(const std::tr1::shared_ptr<const PackageID> &, - const Environment * const env, const std::tr1::shared_ptr<const Choice> &); + ELikeRecommendedTestsChoiceValue(const std::shared_ptr<const PackageID> &, + const Environment * const env, const std::shared_ptr<const Choice> &); virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -127,8 +127,8 @@ namespace paludis const bool _enabled; public: - ELikeExpensiveTestsChoiceValue(const std::tr1::shared_ptr<const PackageID> &, - const Environment * const env, const std::tr1::shared_ptr<const Choice> &); + ELikeExpensiveTestsChoiceValue(const std::shared_ptr<const PackageID> &, + const Environment * const env, const std::shared_ptr<const Choice> &); virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -151,8 +151,8 @@ namespace paludis const std::string _parameter; public: - ELikeJobsChoiceValue(const std::tr1::shared_ptr<const PackageID> &, - const Environment * const env, const std::tr1::shared_ptr<const Choice> &); + ELikeJobsChoiceValue(const std::shared_ptr<const PackageID> &, + const Environment * const env, const std::shared_ptr<const Choice> &); virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -174,8 +174,8 @@ namespace paludis const bool _enabled; public: - ELikeTraceChoiceValue(const std::tr1::shared_ptr<const PackageID> &, - const Environment * const env, const std::tr1::shared_ptr<const Choice> &); + ELikeTraceChoiceValue(const std::shared_ptr<const PackageID> &, + const Environment * const env, const std::shared_ptr<const Choice> &); virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -201,9 +201,9 @@ namespace paludis * \since 0.48.1 */ ELikePreserveWorkChoiceValue( - const std::tr1::shared_ptr<const PackageID> &, + const std::shared_ptr<const PackageID> &, const Environment * const env, - const std::tr1::shared_ptr<const Choice> &, + const std::shared_ptr<const Choice> &, const bool enabled_by_default); virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/elike_conditional_dep_spec-fwd.hh b/paludis/elike_conditional_dep_spec-fwd.hh index ea7385a79..01e8b1305 100644 --- a/paludis/elike_conditional_dep_spec-fwd.hh +++ b/paludis/elike_conditional_dep_spec-fwd.hh @@ -32,7 +32,7 @@ namespace paludis class ELikeConditionalDepSpecParseError; ConditionalDepSpec parse_elike_conditional_dep_spec(const std::string &, - const Environment * const, const std::tr1::shared_ptr<const PackageID> &, + const Environment * const, const std::shared_ptr<const PackageID> &, const bool no_warning_for_unlisted) PALUDIS_VISIBLE; bool elike_conditional_dep_spec_is_inverse(const ConditionalDepSpec & spec) PALUDIS_VISIBLE; diff --git a/paludis/elike_conditional_dep_spec.cc b/paludis/elike_conditional_dep_spec.cc index 5566372ff..6f62c4a45 100644 --- a/paludis/elike_conditional_dep_spec.cc +++ b/paludis/elike_conditional_dep_spec.cc @@ -53,7 +53,7 @@ namespace return false; } - const std::tr1::shared_ptr<const ChoiceValue> v(id.choices_key()->value()->find_by_name_with_prefix(f)); + const std::shared_ptr<const ChoiceValue> v(id.choices_key()->value()->find_by_name_with_prefix(f)); if (v) return v->enabled(); @@ -73,7 +73,7 @@ namespace return false; } - const std::tr1::shared_ptr<const ChoiceValue> v(id.choices_key()->value()->find_by_name_with_prefix(f)); + const std::shared_ptr<const ChoiceValue> v(id.choices_key()->value()->find_by_name_with_prefix(f)); if (v) return v->locked(); @@ -91,10 +91,10 @@ namespace ChoiceNameWithPrefix flag; const Environment * const env; - const std::tr1::shared_ptr<const PackageID> id; + const std::shared_ptr<const PackageID> id; bool no_warning_for_unlisted; - EConditionalDepSpecData(const std::string & s, const Environment * const e, const std::tr1::shared_ptr<const PackageID> & i, + EConditionalDepSpecData(const std::string & s, const Environment * const e, const std::shared_ptr<const PackageID> & i, const bool n) : inverse(false), flag("x"), @@ -147,7 +147,7 @@ namespace ConditionalDepSpec paludis::parse_elike_conditional_dep_spec(const std::string & s, - const Environment * const env, const std::tr1::shared_ptr<const PackageID> & id, + const Environment * const env, const std::shared_ptr<const PackageID> & id, const bool no_warning_for_unlisted) { return ConditionalDepSpec(make_shared_ptr(new EConditionalDepSpecData(s, env, id, no_warning_for_unlisted))); diff --git a/paludis/elike_dep_parser-fwd.hh b/paludis/elike_dep_parser-fwd.hh index 8474a054a..09366f4c9 100644 --- a/paludis/elike_dep_parser-fwd.hh +++ b/paludis/elike_dep_parser-fwd.hh @@ -23,26 +23,26 @@ #include <paludis/util/attributes.hh> #include <paludis/util/map-fwd.hh> #include <paludis/name-fwd.hh> -#include <tr1/functional> -#include <tr1/memory> +#include <functional> +#include <memory> #include <string> namespace paludis { struct ELikeDepParserCallbacks; - typedef std::tr1::function<void (const std::string &)> ELikeDepParserStringFunction; - typedef std::tr1::function<void (const std::string &, const std::string &)> ELikeDepParserArrowFunction; - typedef std::tr1::function<void ()> ELikeDepParserAnyFunction; - typedef std::tr1::function<void ()> ELikeDepParserAllFunction; - typedef std::tr1::function<void (const std::string &)> ELikeDepParserUseFunction; - typedef std::tr1::function<void (const std::string &)> ELikeDepParserLabelFunction; - typedef std::tr1::function<void ()> ELikeDepParserPushFunction; - typedef std::tr1::function<void ()> ELikeDepParserPopFunction; - typedef std::tr1::function<void ()> ELikeDepParserShouldBeEmptyFunction; - typedef std::tr1::function<void (const std::string &, const std::string::size_type &, const std::string &)> ELikeDepParserErrorFunction; - typedef std::tr1::function<void ()> ELikeDepParserUseUnderAnyFunction; - typedef std::tr1::function<void (const std::tr1::shared_ptr<const Map<std::string, std::string> > &)> + typedef std::function<void (const std::string &)> ELikeDepParserStringFunction; + typedef std::function<void (const std::string &, const std::string &)> ELikeDepParserArrowFunction; + typedef std::function<void ()> ELikeDepParserAnyFunction; + typedef std::function<void ()> ELikeDepParserAllFunction; + typedef std::function<void (const std::string &)> ELikeDepParserUseFunction; + typedef std::function<void (const std::string &)> ELikeDepParserLabelFunction; + typedef std::function<void ()> ELikeDepParserPushFunction; + typedef std::function<void ()> ELikeDepParserPopFunction; + typedef std::function<void ()> ELikeDepParserShouldBeEmptyFunction; + typedef std::function<void (const std::string &, const std::string::size_type &, const std::string &)> ELikeDepParserErrorFunction; + typedef std::function<void ()> ELikeDepParserUseUnderAnyFunction; + typedef std::function<void (const std::shared_ptr<const Map<std::string, std::string> > &)> ELikeDepParserAnnotationsFunction; void parse_elike_dependencies(const std::string &, const ELikeDepParserCallbacks & callbacks) PALUDIS_VISIBLE; diff --git a/paludis/elike_dep_parser.cc b/paludis/elike_dep_parser.cc index 615a37e68..b91917703 100644 --- a/paludis/elike_dep_parser.cc +++ b/paludis/elike_dep_parser.cc @@ -48,7 +48,7 @@ namespace if (! parser.consume(+simple_parser::any_of(" \t\r\n"))) error(parser, callbacks, "Expected space after '[['"); - std::tr1::shared_ptr<Map<std::string, std::string> > annotations(new Map<std::string, std::string>); + std::shared_ptr<Map<std::string, std::string> > annotations(new Map<std::string, std::string>); while (true) { std::string word; diff --git a/paludis/elike_dep_parser_TEST.cc b/paludis/elike_dep_parser_TEST.cc index 99021e025..2bb20be68 100644 --- a/paludis/elike_dep_parser_TEST.cc +++ b/paludis/elike_dep_parser_TEST.cc @@ -43,7 +43,7 @@ namespace { } - void handle_annotations(std::string & s, const std::tr1::shared_ptr<const Map<std::string, std::string> > & m) + void handle_annotations(std::string & s, const std::shared_ptr<const Map<std::string, std::string> > & m) { s.append("["); for (Map<std::string, std::string>::ConstIterator i(m->begin()), i_end(m->end()) ; @@ -61,20 +61,20 @@ namespace test_cases void run() { - using namespace std::tr1::placeholders; + using namespace std::placeholders; std::string in("|| ( a b ( c d e ) )"), out; ELikeDepParserCallbacks callbacks(make_named_values<ELikeDepParserCallbacks>( - n::on_all() = std::tr1::bind(&handler, std::tr1::ref(out), "all<", "", "", "", ""), - n::on_annotations() = std::tr1::bind(&handle_annotations, std::tr1::ref(out), _1), - n::on_any() = std::tr1::bind(&handler, std::tr1::ref(out), "any<", "", "", "", ""), - n::on_arrow() = std::tr1::bind(&handler, std::tr1::ref(out), "a<", _1, ", ", _2, ">"), - n::on_error() = std::tr1::bind(&handler, std::tr1::ref(out), "error<", _1, ">", "", ""), - n::on_label() = std::tr1::bind(&handler, std::tr1::ref(out), "label<", _1, "", "", ""), - n::on_pop() = std::tr1::bind(&handler, std::tr1::ref(out), ">", "", "", "", ""), - n::on_should_be_empty() = std::tr1::bind(&handler, std::tr1::ref(out), "EMPTY", "", "", "", ""), - n::on_string() = std::tr1::bind(&handler, std::tr1::ref(out), "s<", _1, ">", "", ""), - n::on_use() = std::tr1::bind(&handler, std::tr1::ref(out), "use<", _1, ", ", "", ""), + n::on_all() = std::bind(&handler, std::ref(out), "all<", "", "", "", ""), + n::on_annotations() = std::bind(&handle_annotations, std::ref(out), _1), + n::on_any() = std::bind(&handler, std::ref(out), "any<", "", "", "", ""), + n::on_arrow() = std::bind(&handler, std::ref(out), "a<", _1, ", ", _2, ">"), + n::on_error() = std::bind(&handler, std::ref(out), "error<", _1, ">", "", ""), + n::on_label() = std::bind(&handler, std::ref(out), "label<", _1, "", "", ""), + n::on_pop() = std::bind(&handler, std::ref(out), ">", "", "", "", ""), + n::on_should_be_empty() = std::bind(&handler, std::ref(out), "EMPTY", "", "", "", ""), + n::on_string() = std::bind(&handler, std::ref(out), "s<", _1, ">", "", ""), + n::on_use() = std::bind(&handler, std::ref(out), "use<", _1, ", ", "", ""), n::on_use_under_any() = &do_nothing )); parse_elike_dependencies(in, callbacks); @@ -88,20 +88,20 @@ namespace test_cases void run() { - using namespace std::tr1::placeholders; + using namespace std::placeholders; std::string in("( ( ) )"), out; ELikeDepParserCallbacks callbacks(make_named_values<ELikeDepParserCallbacks>( - n::on_all() = std::tr1::bind(&handler, std::tr1::ref(out), "all<", "", "", "", ""), - n::on_annotations() = std::tr1::bind(&handle_annotations, std::tr1::ref(out), _1), - n::on_any() = std::tr1::bind(&handler, std::tr1::ref(out), "any<", "", "", "", ""), - n::on_arrow() = std::tr1::bind(&handler, std::tr1::ref(out), "a<", _1, ", ", _2, ">"), - n::on_error() = std::tr1::bind(&handler, std::tr1::ref(out), "error<", _1, ">", "", ""), - n::on_label() = std::tr1::bind(&handler, std::tr1::ref(out), "label<", _1, "", "", ""), - n::on_pop() = std::tr1::bind(&handler, std::tr1::ref(out), ">", "", "", "", ""), - n::on_should_be_empty() = std::tr1::bind(&handler, std::tr1::ref(out), "EMPTY", "", "", "", ""), - n::on_string() = std::tr1::bind(&handler, std::tr1::ref(out), "s<", _1, ">", "", ""), - n::on_use() = std::tr1::bind(&handler, std::tr1::ref(out), "use<", _1, ", ", "", ""), + n::on_all() = std::bind(&handler, std::ref(out), "all<", "", "", "", ""), + n::on_annotations() = std::bind(&handle_annotations, std::ref(out), _1), + n::on_any() = std::bind(&handler, std::ref(out), "any<", "", "", "", ""), + n::on_arrow() = std::bind(&handler, std::ref(out), "a<", _1, ", ", _2, ">"), + n::on_error() = std::bind(&handler, std::ref(out), "error<", _1, ">", "", ""), + n::on_label() = std::bind(&handler, std::ref(out), "label<", _1, "", "", ""), + n::on_pop() = std::bind(&handler, std::ref(out), ">", "", "", "", ""), + n::on_should_be_empty() = std::bind(&handler, std::ref(out), "EMPTY", "", "", "", ""), + n::on_string() = std::bind(&handler, std::ref(out), "s<", _1, ">", "", ""), + n::on_use() = std::bind(&handler, std::ref(out), "use<", _1, ", ", "", ""), n::on_use_under_any() = &do_nothing )); parse_elike_dependencies(in, callbacks); @@ -115,20 +115,20 @@ namespace test_cases void run() { - using namespace std::tr1::placeholders; + using namespace std::placeholders; std::string in("a [[ first = foo second = [ bar baz ] ]]"), out; ELikeDepParserCallbacks callbacks(make_named_values<ELikeDepParserCallbacks>( - n::on_all() = std::tr1::bind(&handler, std::tr1::ref(out), "all<", "", "", "", ""), - n::on_annotations() = std::tr1::bind(&handle_annotations, std::tr1::ref(out), _1), - n::on_any() = std::tr1::bind(&handler, std::tr1::ref(out), "any<", "", "", "", ""), - n::on_arrow() = std::tr1::bind(&handler, std::tr1::ref(out), "a<", _1, ", ", _2, ">"), - n::on_error() = std::tr1::bind(&handler, std::tr1::ref(out), "error<", _1, ">", "", ""), - n::on_label() = std::tr1::bind(&handler, std::tr1::ref(out), "label<", _1, "", "", ""), - n::on_pop() = std::tr1::bind(&handler, std::tr1::ref(out), ">", "", "", "", ""), - n::on_should_be_empty() = std::tr1::bind(&handler, std::tr1::ref(out), "EMPTY", "", "", "", ""), - n::on_string() = std::tr1::bind(&handler, std::tr1::ref(out), "s<", _1, ">", "", ""), - n::on_use() = std::tr1::bind(&handler, std::tr1::ref(out), "use<", _1, ", ", "", ""), + n::on_all() = std::bind(&handler, std::ref(out), "all<", "", "", "", ""), + n::on_annotations() = std::bind(&handle_annotations, std::ref(out), _1), + n::on_any() = std::bind(&handler, std::ref(out), "any<", "", "", "", ""), + n::on_arrow() = std::bind(&handler, std::ref(out), "a<", _1, ", ", _2, ">"), + n::on_error() = std::bind(&handler, std::ref(out), "error<", _1, ">", "", ""), + n::on_label() = std::bind(&handler, std::ref(out), "label<", _1, "", "", ""), + n::on_pop() = std::bind(&handler, std::ref(out), ">", "", "", "", ""), + n::on_should_be_empty() = std::bind(&handler, std::ref(out), "EMPTY", "", "", "", ""), + n::on_string() = std::bind(&handler, std::ref(out), "s<", _1, ">", "", ""), + n::on_use() = std::bind(&handler, std::ref(out), "use<", _1, ", ", "", ""), n::on_use_under_any() = &do_nothing )); parse_elike_dependencies(in, callbacks); diff --git a/paludis/elike_package_dep_spec-fwd.hh b/paludis/elike_package_dep_spec-fwd.hh index 18ca82f3f..bdbb09f64 100644 --- a/paludis/elike_package_dep_spec-fwd.hh +++ b/paludis/elike_package_dep_spec-fwd.hh @@ -26,7 +26,7 @@ #include <paludis/package_id-fwd.hh> #include <paludis/version_operator-fwd.hh> #include <paludis/version_spec-fwd.hh> -#include <tr1/functional> +#include <functional> #include <iosfwd> namespace paludis @@ -47,13 +47,13 @@ namespace paludis PackageDepSpec parse_elike_package_dep_spec(const std::string & ss, const ELikePackageDepSpecOptions &, const VersionSpecOptions &, - const std::tr1::shared_ptr<const PackageID> &) + const std::shared_ptr<const PackageID> &) PALUDIS_ATTRIBUTE((warn_unused_result)) PALUDIS_VISIBLE; PartiallyMadePackageDepSpec partial_parse_elike_package_dep_spec(const std::string & ss, const ELikePackageDepSpecOptions &, const VersionSpecOptions &, - const std::tr1::shared_ptr<const PackageID> &) + const std::shared_ptr<const PackageID> &) PALUDIS_ATTRIBUTE((warn_unused_result)) PALUDIS_VISIBLE; void elike_check_sanity(const std::string & s) PALUDIS_VISIBLE; @@ -62,7 +62,7 @@ namespace paludis const ELikePackageDepSpecOptions & options, const VersionSpecOptions & version_options, bool & had_bracket_version_requirements, - bool & had_use_requirements, const std::tr1::shared_ptr<const PackageID> & id) PALUDIS_VISIBLE; + bool & had_use_requirements, const std::shared_ptr<const PackageID> & id) PALUDIS_VISIBLE; void elike_remove_trailing_repo_if_exists(std::string & s, PartiallyMadePackageDepSpec & result, const ELikePackageDepSpecOptions & options) PALUDIS_VISIBLE; diff --git a/paludis/elike_package_dep_spec.cc b/paludis/elike_package_dep_spec.cc index c50915125..ae2b4cec2 100644 --- a/paludis/elike_package_dep_spec.cc +++ b/paludis/elike_package_dep_spec.cc @@ -90,7 +90,7 @@ paludis::elike_remove_trailing_square_bracket_if_exists(std::string & s, Partial const ELikePackageDepSpecOptions & options, const VersionSpecOptions & version_options, bool & had_bracket_version_requirements, - bool & had_use_requirements, const std::tr1::shared_ptr<const PackageID> & id) + bool & had_use_requirements, const std::shared_ptr<const PackageID> & id) { std::string::size_type use_group_p; if (std::string::npos == ((use_group_p = s.rfind('[')))) @@ -197,7 +197,7 @@ paludis::elike_remove_trailing_square_bracket_if_exists(std::string & s, Partial Log::get_instance()->message("e.package_dep_spec.key_not_allowed", ll_warning, lc_context) << "Key requirements not safe for use here"; } - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req(new UserKeyRequirement(flag.substr(1))); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req(new UserKeyRequirement(flag.substr(1))); result.additional_requirement(req); } break; @@ -238,7 +238,7 @@ paludis::elike_remove_trailing_square_bracket_if_exists(std::string & s, Partial if (options[epdso_strict_parsing]) euro += euro_strict_parsing; - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req(parse_elike_use_requirement(flag, id, euro)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req(parse_elike_use_requirement(flag, id, euro)); result.additional_requirement(req); break; @@ -471,9 +471,9 @@ PartiallyMadePackageDepSpec paludis::partial_parse_elike_package_dep_spec( const std::string & ss, const ELikePackageDepSpecOptions & options, const VersionSpecOptions & version_options, - const std::tr1::shared_ptr<const PackageID> & id) + const std::shared_ptr<const PackageID> & id) { - using namespace std::tr1::placeholders; + using namespace std::placeholders; Context context("When parsing elike package dep spec '" + ss + "':"); @@ -484,25 +484,25 @@ paludis::partial_parse_elike_package_dep_spec( o += pmpdso_always_use_ranged_deps; return partial_parse_generic_elike_package_dep_spec(ss, make_named_values<GenericELikePackageDepSpecParseFunctions>( - n::add_package_requirement() = std::tr1::bind(&elike_add_package_requirement, _1, _2), - n::add_version_requirement() = std::tr1::bind(&elike_add_version_requirement, _1, _2, _3), + n::add_package_requirement() = std::bind(&elike_add_package_requirement, _1, _2), + n::add_version_requirement() = std::bind(&elike_add_version_requirement, _1, _2, _3), n::check_sanity() = &elike_check_sanity, - n::get_remove_trailing_version() = std::tr1::bind(&elike_get_remove_trailing_version, _1, version_options), - n::get_remove_version_operator() = std::tr1::bind(&elike_get_remove_version_operator, _1, options), - n::has_version_operator() = std::tr1::bind(&elike_has_version_operator, _1, - std::tr1::cref(had_bracket_version_requirements), options), - n::options_for_partially_made_package_dep_spec() = std::tr1::bind(&fixed_options_for_partially_made_package_dep_spec, o), - n::remove_trailing_repo_if_exists() = std::tr1::bind(&elike_remove_trailing_repo_if_exists, _1, _2, options), - n::remove_trailing_slot_if_exists() = std::tr1::bind(&elike_remove_trailing_slot_if_exists, _1, _2, options), - n::remove_trailing_square_bracket_if_exists() = std::tr1::bind(&elike_remove_trailing_square_bracket_if_exists, - _1, _2, options, version_options, std::tr1::ref(had_bracket_version_requirements), std::tr1::ref(had_use_requirements), id) + n::get_remove_trailing_version() = std::bind(&elike_get_remove_trailing_version, _1, version_options), + n::get_remove_version_operator() = std::bind(&elike_get_remove_version_operator, _1, options), + n::has_version_operator() = std::bind(&elike_has_version_operator, _1, + std::cref(had_bracket_version_requirements), options), + n::options_for_partially_made_package_dep_spec() = std::bind(&fixed_options_for_partially_made_package_dep_spec, o), + n::remove_trailing_repo_if_exists() = std::bind(&elike_remove_trailing_repo_if_exists, _1, _2, options), + n::remove_trailing_slot_if_exists() = std::bind(&elike_remove_trailing_slot_if_exists, _1, _2, options), + n::remove_trailing_square_bracket_if_exists() = std::bind(&elike_remove_trailing_square_bracket_if_exists, + _1, _2, options, version_options, std::ref(had_bracket_version_requirements), std::ref(had_use_requirements), id) )); } PackageDepSpec paludis::parse_elike_package_dep_spec(const std::string & ss, const ELikePackageDepSpecOptions & options, const VersionSpecOptions & version_options, - const std::tr1::shared_ptr<const PackageID> & id) + const std::shared_ptr<const PackageID> & id) { return partial_parse_elike_package_dep_spec(ss, options, version_options, id); } diff --git a/paludis/elike_package_dep_spec.hh b/paludis/elike_package_dep_spec.hh index ca57296d1..201710e6c 100644 --- a/paludis/elike_package_dep_spec.hh +++ b/paludis/elike_package_dep_spec.hh @@ -41,16 +41,16 @@ namespace paludis struct GenericELikePackageDepSpecParseFunctions { - NamedValue<n::add_package_requirement, std::tr1::function<void (const std::string &, PartiallyMadePackageDepSpec &)> > add_package_requirement; - NamedValue<n::add_version_requirement, std::tr1::function<void (const VersionOperator &, const VersionSpec &, PartiallyMadePackageDepSpec &)> > add_version_requirement; - NamedValue<n::check_sanity, std::tr1::function<void (const std::string &)> > check_sanity; - NamedValue<n::get_remove_trailing_version, std::tr1::function<VersionSpec (std::string &)> > get_remove_trailing_version; - NamedValue<n::get_remove_version_operator, std::tr1::function<VersionOperator (std::string &)> > get_remove_version_operator; - NamedValue<n::has_version_operator, std::tr1::function<bool (const std::string &)> > has_version_operator; - NamedValue<n::options_for_partially_made_package_dep_spec, std::tr1::function<const PartiallyMadePackageDepSpecOptions ()> > options_for_partially_made_package_dep_spec; - NamedValue<n::remove_trailing_repo_if_exists, std::tr1::function<void (std::string &, PartiallyMadePackageDepSpec &)> > remove_trailing_repo_if_exists; - NamedValue<n::remove_trailing_slot_if_exists, std::tr1::function<void (std::string &, PartiallyMadePackageDepSpec &)> > remove_trailing_slot_if_exists; - NamedValue<n::remove_trailing_square_bracket_if_exists, std::tr1::function<bool (std::string &, PartiallyMadePackageDepSpec &)> > remove_trailing_square_bracket_if_exists; + NamedValue<n::add_package_requirement, std::function<void (const std::string &, PartiallyMadePackageDepSpec &)> > add_package_requirement; + NamedValue<n::add_version_requirement, std::function<void (const VersionOperator &, const VersionSpec &, PartiallyMadePackageDepSpec &)> > add_version_requirement; + NamedValue<n::check_sanity, std::function<void (const std::string &)> > check_sanity; + NamedValue<n::get_remove_trailing_version, std::function<VersionSpec (std::string &)> > get_remove_trailing_version; + NamedValue<n::get_remove_version_operator, std::function<VersionOperator (std::string &)> > get_remove_version_operator; + NamedValue<n::has_version_operator, std::function<bool (const std::string &)> > has_version_operator; + NamedValue<n::options_for_partially_made_package_dep_spec, std::function<const PartiallyMadePackageDepSpecOptions ()> > options_for_partially_made_package_dep_spec; + NamedValue<n::remove_trailing_repo_if_exists, std::function<void (std::string &, PartiallyMadePackageDepSpec &)> > remove_trailing_repo_if_exists; + NamedValue<n::remove_trailing_slot_if_exists, std::function<void (std::string &, PartiallyMadePackageDepSpec &)> > remove_trailing_slot_if_exists; + NamedValue<n::remove_trailing_square_bracket_if_exists, std::function<bool (std::string &, PartiallyMadePackageDepSpec &)> > remove_trailing_square_bracket_if_exists; }; } diff --git a/paludis/elike_use_requirement-fwd.hh b/paludis/elike_use_requirement-fwd.hh index fca3a8e66..47abd0e7f 100644 --- a/paludis/elike_use_requirement-fwd.hh +++ b/paludis/elike_use_requirement-fwd.hh @@ -26,7 +26,7 @@ #include <paludis/dep_spec-fwd.hh> #include <iosfwd> #include <string> -#include <tr1/functional> +#include <functional> namespace paludis { @@ -36,8 +36,8 @@ namespace paludis typedef Options<ELikeUseRequirementOption> ELikeUseRequirementOptions; - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> parse_elike_use_requirement( - const std::string &, const std::tr1::shared_ptr<const PackageID> &, const ELikeUseRequirementOptions &) + std::shared_ptr<const AdditionalPackageDepSpecRequirement> parse_elike_use_requirement( + const std::string &, const std::shared_ptr<const PackageID> &, const ELikeUseRequirementOptions &) PALUDIS_ATTRIBUTE((warn_unused_result)) PALUDIS_VISIBLE; } diff --git a/paludis/elike_use_requirement.cc b/paludis/elike_use_requirement.cc index ff8c15045..2307527da 100644 --- a/paludis/elike_use_requirement.cc +++ b/paludis/elike_use_requirement.cc @@ -49,7 +49,7 @@ namespace return false; } - const std::tr1::shared_ptr<const ChoiceValue> v(id.choices_key()->value()->find_by_name_with_prefix(f)); + const std::shared_ptr<const ChoiceValue> v(id.choices_key()->value()->find_by_name_with_prefix(f)); if (v) return v->enabled(); @@ -63,13 +63,13 @@ namespace { private: const std::string _flags; - const std::tr1::shared_ptr<const PackageID> _id; + const std::shared_ptr<const PackageID> _id; const ELikeUseRequirementOptions _options; const Tribool _default_value; const bool _ignore_if_no_such_group; public: - UseRequirement(const std::string & n, const std::tr1::shared_ptr<const PackageID> & i, + UseRequirement(const std::string & n, const std::shared_ptr<const PackageID> & i, const ELikeUseRequirementOptions & o, Tribool d, const bool g) : _flags(n), _id(i), @@ -116,7 +116,7 @@ namespace return _flags; } - const std::tr1::shared_ptr<const PackageID> package_id() const PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const PackageID> package_id() const PALUDIS_ATTRIBUTE((warn_unused_result)) { return _id; } @@ -193,7 +193,7 @@ namespace { public: EnabledUseRequirement(const std::string & n, - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const ELikeUseRequirementOptions & o, Tribool d, const bool b) : UseRequirement(n, i, o, d, b) @@ -217,7 +217,7 @@ namespace { public: DisabledUseRequirement(const std::string & n, - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const ELikeUseRequirementOptions & o, Tribool d, const bool b) : UseRequirement(n, i, o, d, b) @@ -241,7 +241,7 @@ namespace { public: ConditionalUseRequirement(const std::string & n, - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const ELikeUseRequirementOptions & o, Tribool d, const bool b) : UseRequirement(n, i, o, d, b) @@ -255,7 +255,7 @@ namespace public: IfMineThenUseRequirement( const std::string & n, - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const ELikeUseRequirementOptions & o, Tribool d, const bool b) : ConditionalUseRequirement(n, i, o, d, b) @@ -280,7 +280,7 @@ namespace { public: IfNotMineThenUseRequirement(const std::string & n, - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const ELikeUseRequirementOptions & o, Tribool d, const bool b) : ConditionalUseRequirement(n, i, o, d, b) @@ -305,7 +305,7 @@ namespace { public: IfMineThenNotUseRequirement(const std::string & n, - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const ELikeUseRequirementOptions & o, Tribool d, const bool b) : ConditionalUseRequirement(n, i, o, d, b) @@ -330,7 +330,7 @@ namespace { public: IfNotMineThenNotUseRequirement(const std::string & n, - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const ELikeUseRequirementOptions & o, Tribool d, const bool b) : ConditionalUseRequirement(n, i, o, d, b) @@ -355,7 +355,7 @@ namespace { public: EqualUseRequirement(const std::string & n, - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const ELikeUseRequirementOptions & o, Tribool d, const bool b) : ConditionalUseRequirement(n, i, o, d, b) @@ -380,7 +380,7 @@ namespace { public: NotEqualUseRequirement(const std::string & n, - const std::tr1::shared_ptr<const PackageID> & i, + const std::shared_ptr<const PackageID> & i, const ELikeUseRequirementOptions & o, Tribool d, const bool b) : ConditionalUseRequirement(n, i, o, d, b) @@ -404,7 +404,7 @@ namespace public AdditionalPackageDepSpecRequirement { private: - typedef std::vector<std::tr1::shared_ptr<const UseRequirement> > Reqs; + typedef std::vector<std::shared_ptr<const UseRequirement> > Reqs; std::string _raw; Reqs _reqs; @@ -417,7 +417,7 @@ namespace virtual const std::pair<bool, std::string> requirement_met(const Environment * const env, const PackageID & id) const { - using namespace std::tr1::placeholders; + using namespace std::placeholders; std::pair<bool, std::string> result(true, ""); for (Reqs::const_iterator r(_reqs.begin()), r_end(_reqs.end()) ; @@ -438,7 +438,7 @@ namespace virtual const std::string as_human_string() const { - return join(_reqs.begin(), _reqs.end(), "; ", std::tr1::mem_fn(&UseRequirement::as_human_string)); + return join(_reqs.begin(), _reqs.end(), "; ", std::mem_fn(&UseRequirement::as_human_string)); } virtual const std::string as_raw_string() const @@ -446,30 +446,30 @@ namespace return _raw; } - void add_requirement(const std::tr1::shared_ptr<const UseRequirement> & req) + void add_requirement(const std::shared_ptr<const UseRequirement> & req) { _reqs.push_back(req); } }; template <typename T_> - std::tr1::shared_ptr<const UseRequirement> - make_requirement(const std::string & n, const std::tr1::shared_ptr<const PackageID > & i, + std::shared_ptr<const UseRequirement> + make_requirement(const std::string & n, const std::shared_ptr<const PackageID > & i, const ELikeUseRequirementOptions & o, Tribool d, const bool b) { return make_shared_ptr(new T_(n, i, o, d, b)); } - typedef std::tr1::shared_ptr<const UseRequirement> (* Factory)( - const std::string &, const std::tr1::shared_ptr<const PackageID> &, + typedef std::shared_ptr<const UseRequirement> (* Factory)( + const std::string &, const std::shared_ptr<const PackageID> &, const ELikeUseRequirementOptions &, Tribool, bool); void parse_flag( - const std::tr1::shared_ptr<UseRequirements> & result, + const std::shared_ptr<UseRequirements> & result, const Factory & factory, const std::string & c, - const std::tr1::shared_ptr<const PackageID> & id, + const std::shared_ptr<const PackageID> & id, Tribool d, const bool i, const ELikeUseRequirementOptions & options) @@ -479,9 +479,9 @@ namespace void parse_one_use_requirement( - const std::tr1::shared_ptr<UseRequirements> & result, + const std::shared_ptr<UseRequirements> & result, const std::string & s, std::string & flag, - const std::tr1::shared_ptr<const PackageID> & id, const ELikeUseRequirementOptions & options) + const std::shared_ptr<const PackageID> & id, const ELikeUseRequirementOptions & options) { Factory factory; @@ -687,13 +687,13 @@ ELikeUseRequirementError::ELikeUseRequirementError(const std::string & s, const { } -std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> +std::shared_ptr<const AdditionalPackageDepSpecRequirement> paludis::parse_elike_use_requirement(const std::string & s, - const std::tr1::shared_ptr<const PackageID> & id, const ELikeUseRequirementOptions & options) + const std::shared_ptr<const PackageID> & id, const ELikeUseRequirementOptions & options) { Context context("When parsing use requirement '" + s + "':"); - std::tr1::shared_ptr<UseRequirements> result(new UseRequirements("[" + s + "]")); + std::shared_ptr<UseRequirements> result(new UseRequirements("[" + s + "]")); std::string::size_type pos(0); for (;;) { diff --git a/paludis/elike_use_requirement_TEST.cc b/paludis/elike_use_requirement_TEST.cc index 5ee5f8571..65d18bdb2 100644 --- a/paludis/elike_use_requirement_TEST.cc +++ b/paludis/elike_use_requirement_TEST.cc @@ -35,7 +35,7 @@ using namespace test; namespace { - void set_conditionals(const std::tr1::shared_ptr<FakePackageID> & id, const std::string & s) + void set_conditionals(const std::shared_ptr<FakePackageID> & id, const std::string & s) { std::list<std::string> tokens; tokenise_whitespace(s, std::back_inserter(tokens)); @@ -61,34 +61,34 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "pkg1", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "pkg1", "1")); set_conditionals(id, "enabled disabled"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( - parse_elike_use_requirement("enabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + parse_elike_use_requirement("enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing)); TEST_CHECK_EQUAL(req1->as_raw_string(), "[enabled]"); TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'enabled' enabled"); TEST_CHECK(req1->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( - parse_elike_use_requirement("disabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + parse_elike_use_requirement("disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing)); TEST_CHECK_EQUAL(req2->as_raw_string(), "[disabled]"); TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'disabled' enabled"); TEST_CHECK(! req2->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req3( - parse_elike_use_requirement("-enabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req3( + parse_elike_use_requirement("-enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing)); TEST_CHECK_EQUAL(req3->as_raw_string(), "[-enabled]"); TEST_CHECK_EQUAL(req3->as_human_string(), "Flag 'enabled' disabled"); TEST_CHECK(! req3->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req4( - parse_elike_use_requirement("-disabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req4( + parse_elike_use_requirement("-disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing)); TEST_CHECK_EQUAL(req4->as_raw_string(), "[-disabled]"); TEST_CHECK_EQUAL(req4->as_human_string(), "Flag 'disabled' disabled"); TEST_CHECK(req4->requirement_met(&env, *id).first); @@ -102,34 +102,34 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("repo") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "pkg1", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "pkg1", "1")); set_conditionals(id, "enabled disabled"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( - parse_elike_use_requirement("enabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + parse_elike_use_requirement("enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req1->as_raw_string(), "[enabled]"); TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'enabled' enabled"); TEST_CHECK(req1->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( - parse_elike_use_requirement("disabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + parse_elike_use_requirement("disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req2->as_raw_string(), "[disabled]"); TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'disabled' enabled"); TEST_CHECK(! req2->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req3( - parse_elike_use_requirement("-enabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req3( + parse_elike_use_requirement("-enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req3->as_raw_string(), "[-enabled]"); TEST_CHECK_EQUAL(req3->as_human_string(), "Flag 'enabled' disabled"); TEST_CHECK(! req3->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req4( - parse_elike_use_requirement("-disabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req4( + parse_elike_use_requirement("-disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req4->as_raw_string(), "[-disabled]"); TEST_CHECK_EQUAL(req4->as_human_string(), "Flag 'disabled' disabled"); TEST_CHECK(req4->requirement_met(&env, *id).first); @@ -143,40 +143,40 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "pkg1", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "pkg1", "1")); set_conditionals(id, "enabled disabled"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( - parse_elike_use_requirement("enabled,-disabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + parse_elike_use_requirement("enabled,-disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req1->as_raw_string(), "[enabled,-disabled]"); TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'enabled' enabled; Flag 'disabled' disabled"); TEST_CHECK(req1->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( - parse_elike_use_requirement("enabled,disabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + parse_elike_use_requirement("enabled,disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req2->as_raw_string(), "[enabled,disabled]"); TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'enabled' enabled; Flag 'disabled' enabled"); TEST_CHECK(! req2->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req3( - parse_elike_use_requirement("-enabled,-disabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req3( + parse_elike_use_requirement("-enabled,-disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req3->as_raw_string(), "[-enabled,-disabled]"); TEST_CHECK_EQUAL(req3->as_human_string(), "Flag 'enabled' disabled; Flag 'disabled' disabled"); TEST_CHECK(! req3->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req4( - parse_elike_use_requirement("enabled,-disabled,-enabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req4( + parse_elike_use_requirement("enabled,-disabled,-enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req4->as_raw_string(), "[enabled,-disabled,-enabled]"); TEST_CHECK_EQUAL(req4->as_human_string(), "Flag 'enabled' enabled; Flag 'disabled' disabled; Flag 'enabled' disabled"); TEST_CHECK(! req4->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req5( - parse_elike_use_requirement("enabled,-disabled,enabled", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req5( + parse_elike_use_requirement("enabled,-disabled,enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req5->as_raw_string(), "[enabled,-disabled,enabled]"); TEST_CHECK_EQUAL(req5->as_human_string(), "Flag 'enabled' enabled; Flag 'disabled' disabled; Flag 'enabled' enabled"); TEST_CHECK(req5->requirement_met(&env, *id).first); @@ -190,94 +190,94 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); set_conditionals(id, "pkgname"); - std::tr1::shared_ptr<FakePackageID> id2(fake->add_version("cat", "disabled", "1")); + std::shared_ptr<FakePackageID> id2(fake->add_version("cat", "disabled", "1")); set_conditionals(id2, "pkgname"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( parse_elike_use_requirement("pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req1->as_raw_string(), "[pkgname?]"); TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req1->requirement_met(&env, *id).first); TEST_CHECK(! req1->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( parse_elike_use_requirement("pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req2->as_raw_string(), "[pkgname?]"); TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req2->requirement_met(&env, *id).first); TEST_CHECK(req2->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req3( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req3( parse_elike_use_requirement("-pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req3->as_raw_string(), "[-pkgname?]"); TEST_CHECK_EQUAL(req3->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req3->requirement_met(&env, *id).first); TEST_CHECK(req3->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req4( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req4( parse_elike_use_requirement("-pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req4->as_raw_string(), "[-pkgname?]"); TEST_CHECK_EQUAL(req4->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req4->requirement_met(&env, *id).first); TEST_CHECK(req4->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req5( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req5( parse_elike_use_requirement("pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req5->as_raw_string(), "[pkgname!?]"); TEST_CHECK_EQUAL(req5->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req5->requirement_met(&env, *id).first); TEST_CHECK(req5->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req6( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req6( parse_elike_use_requirement("pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req6->as_raw_string(), "[pkgname!?]"); TEST_CHECK_EQUAL(req6->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req6->requirement_met(&env, *id).first); TEST_CHECK(! req6->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req7( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req7( parse_elike_use_requirement("-pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req7->as_raw_string(), "[-pkgname!?]"); TEST_CHECK_EQUAL(req7->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req7->requirement_met(&env, *id).first); TEST_CHECK(req7->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req8( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req8( parse_elike_use_requirement("-pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req8->as_raw_string(), "[-pkgname!?]"); TEST_CHECK_EQUAL(req8->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req8->requirement_met(&env, *id).first); TEST_CHECK(req8->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req9( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req9( parse_elike_use_requirement("pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req9->as_raw_string(), "[pkgname=]"); TEST_CHECK_EQUAL(req9->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(req9->requirement_met(&env, *id).first); TEST_CHECK(! req9->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req10( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req10( parse_elike_use_requirement("pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req10->as_raw_string(), "[pkgname=]"); TEST_CHECK_EQUAL(req10->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req10->requirement_met(&env, *id).first); TEST_CHECK(req10->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req11( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req11( parse_elike_use_requirement("pkgname!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req11->as_raw_string(), "[pkgname!=]"); TEST_CHECK_EQUAL(req11->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req11->requirement_met(&env, *id).first); TEST_CHECK(req11->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req12( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req12( parse_elike_use_requirement("pkgname!=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing)); TEST_CHECK_EQUAL(req12->as_raw_string(), "[pkgname!=]"); TEST_CHECK_EQUAL(req12->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'"); @@ -293,66 +293,66 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); set_conditionals(id, "pkgname"); - std::tr1::shared_ptr<FakePackageID> id2(fake->add_version("cat", "disabled", "1")); + std::shared_ptr<FakePackageID> id2(fake->add_version("cat", "disabled", "1")); set_conditionals(id2, "pkgname"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( parse_elike_use_requirement("pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req1->as_raw_string(), "[pkgname?]"); TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req1->requirement_met(&env, *id).first); TEST_CHECK(! req1->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( parse_elike_use_requirement("pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req2->as_raw_string(), "[pkgname?]"); TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req2->requirement_met(&env, *id).first); TEST_CHECK(req2->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req7( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req7( parse_elike_use_requirement("!pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req7->as_raw_string(), "[!pkgname?]"); TEST_CHECK_EQUAL(req7->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req7->requirement_met(&env, *id).first); TEST_CHECK(req7->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req8( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req8( parse_elike_use_requirement("!pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req8->as_raw_string(), "[!pkgname?]"); TEST_CHECK_EQUAL(req8->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req8->requirement_met(&env, *id).first); TEST_CHECK(req8->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req9( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req9( parse_elike_use_requirement("pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req9->as_raw_string(), "[pkgname=]"); TEST_CHECK_EQUAL(req9->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(req9->requirement_met(&env, *id).first); TEST_CHECK(! req9->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req10( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req10( parse_elike_use_requirement("pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req10->as_raw_string(), "[pkgname=]"); TEST_CHECK_EQUAL(req10->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req10->requirement_met(&env, *id).first); TEST_CHECK(req10->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req11( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req11( parse_elike_use_requirement("!pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req11->as_raw_string(), "[!pkgname=]"); TEST_CHECK_EQUAL(req11->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req11->requirement_met(&env, *id).first); TEST_CHECK(req11->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req12( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req12( parse_elike_use_requirement("!pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing)); TEST_CHECK_EQUAL(req12->as_raw_string(), "[!pkgname=]"); TEST_CHECK_EQUAL(req12->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'"); @@ -368,122 +368,122 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); set_conditionals(id, "pkgname"); - std::tr1::shared_ptr<FakePackageID> id2(fake->add_version("cat", "disabled", "1")); + std::shared_ptr<FakePackageID> id2(fake->add_version("cat", "disabled", "1")); set_conditionals(id2, "pkgname"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( parse_elike_use_requirement("pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req1->as_raw_string(), "[pkgname?]"); TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req1->requirement_met(&env, *id).first); TEST_CHECK(! req1->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( parse_elike_use_requirement("pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req2->as_raw_string(), "[pkgname?]"); TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req2->requirement_met(&env, *id).first); TEST_CHECK(req2->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req7( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req7( parse_elike_use_requirement("!pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req7->as_raw_string(), "[!pkgname?]"); TEST_CHECK_EQUAL(req7->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req7->requirement_met(&env, *id).first); TEST_CHECK(req7->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req8( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req8( parse_elike_use_requirement("!pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req8->as_raw_string(), "[!pkgname?]"); TEST_CHECK_EQUAL(req8->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req8->requirement_met(&env, *id).first); TEST_CHECK(req8->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req9( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req9( parse_elike_use_requirement("pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req9->as_raw_string(), "[pkgname=]"); TEST_CHECK_EQUAL(req9->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(req9->requirement_met(&env, *id).first); TEST_CHECK(! req9->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req10( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req10( parse_elike_use_requirement("pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req10->as_raw_string(), "[pkgname=]"); TEST_CHECK_EQUAL(req10->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req10->requirement_met(&env, *id).first); TEST_CHECK(req10->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req11( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req11( parse_elike_use_requirement("!pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req11->as_raw_string(), "[!pkgname=]"); TEST_CHECK_EQUAL(req11->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req11->requirement_met(&env, *id).first); TEST_CHECK(req11->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req12( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req12( parse_elike_use_requirement("!pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req12->as_raw_string(), "[!pkgname=]"); TEST_CHECK_EQUAL(req12->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'"); TEST_CHECK(req12->requirement_met(&env, *id).first); TEST_CHECK(! req12->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req13( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req13( parse_elike_use_requirement("-pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req13->as_raw_string(), "[-pkgname?]"); TEST_CHECK_EQUAL(req13->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req13->requirement_met(&env, *id).first); TEST_CHECK(req13->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req14( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req14( parse_elike_use_requirement("-pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req14->as_raw_string(), "[-pkgname?]"); TEST_CHECK_EQUAL(req14->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req14->requirement_met(&env, *id).first); TEST_CHECK(req14->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req15( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req15( parse_elike_use_requirement("pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req15->as_raw_string(), "[pkgname!?]"); TEST_CHECK_EQUAL(req15->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req15->requirement_met(&env, *id).first); TEST_CHECK(req15->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req16( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req16( parse_elike_use_requirement("pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req16->as_raw_string(), "[pkgname!?]"); TEST_CHECK_EQUAL(req16->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req16->requirement_met(&env, *id).first); TEST_CHECK(! req16->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req17( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req17( parse_elike_use_requirement("-pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req17->as_raw_string(), "[-pkgname!?]"); TEST_CHECK_EQUAL(req17->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req17->requirement_met(&env, *id).first); TEST_CHECK(req17->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req18( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req18( parse_elike_use_requirement("-pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req18->as_raw_string(), "[-pkgname!?]"); TEST_CHECK_EQUAL(req18->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req18->requirement_met(&env, *id).first); TEST_CHECK(req18->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req19( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req19( parse_elike_use_requirement("pkgname!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req19->as_raw_string(), "[pkgname!=]"); TEST_CHECK_EQUAL(req19->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req19->requirement_met(&env, *id).first); TEST_CHECK(req19->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req20( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req20( parse_elike_use_requirement("pkgname!=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing)); TEST_CHECK_EQUAL(req20->as_raw_string(), "[pkgname!=]"); TEST_CHECK_EQUAL(req20->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'"); @@ -499,12 +499,12 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); set_conditionals(id, "pkgname"); TEST_CHECK_THROWS(parse_elike_use_requirement("", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError); @@ -529,12 +529,12 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); set_conditionals(id, "pkgname"); TEST_CHECK_THROWS(parse_elike_use_requirement("", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError); @@ -563,12 +563,12 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); set_conditionals(id, "pkgname"); TEST_CHECK_THROWS(parse_elike_use_requirement("", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError); @@ -592,122 +592,122 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); set_conditionals(id, "pkgname"); - std::tr1::shared_ptr<FakePackageID> id2(fake->add_version("cat", "disabled", "1")); + std::shared_ptr<FakePackageID> id2(fake->add_version("cat", "disabled", "1")); set_conditionals(id2, "pkgname"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( parse_elike_use_requirement("pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req1->as_raw_string(), "[pkgname?]"); TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req1->requirement_met(&env, *id).first); TEST_CHECK(! req1->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( parse_elike_use_requirement("pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req2->as_raw_string(), "[pkgname?]"); TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req2->requirement_met(&env, *id).first); TEST_CHECK(req2->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req7( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req7( parse_elike_use_requirement("!pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req7->as_raw_string(), "[!pkgname?]"); TEST_CHECK_EQUAL(req7->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req7->requirement_met(&env, *id).first); TEST_CHECK(req7->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req8( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req8( parse_elike_use_requirement("!pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req8->as_raw_string(), "[!pkgname?]"); TEST_CHECK_EQUAL(req8->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req8->requirement_met(&env, *id).first); TEST_CHECK(req8->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req9( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req9( parse_elike_use_requirement("pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req9->as_raw_string(), "[pkgname=]"); TEST_CHECK_EQUAL(req9->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(req9->requirement_met(&env, *id).first); TEST_CHECK(! req9->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req10( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req10( parse_elike_use_requirement("pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req10->as_raw_string(), "[pkgname=]"); TEST_CHECK_EQUAL(req10->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req10->requirement_met(&env, *id).first); TEST_CHECK(req10->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req11( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req11( parse_elike_use_requirement("!pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req11->as_raw_string(), "[!pkgname=]"); TEST_CHECK_EQUAL(req11->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req11->requirement_met(&env, *id).first); TEST_CHECK(req11->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req12( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req12( parse_elike_use_requirement("!pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req12->as_raw_string(), "[!pkgname=]"); TEST_CHECK_EQUAL(req12->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'"); TEST_CHECK(req12->requirement_met(&env, *id).first); TEST_CHECK(! req12->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req13( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req13( parse_elike_use_requirement("-pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req13->as_raw_string(), "[-pkgname?]"); TEST_CHECK_EQUAL(req13->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req13->requirement_met(&env, *id).first); TEST_CHECK(req13->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req14( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req14( parse_elike_use_requirement("-pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req14->as_raw_string(), "[-pkgname?]"); TEST_CHECK_EQUAL(req14->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req14->requirement_met(&env, *id).first); TEST_CHECK(req14->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req15( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req15( parse_elike_use_requirement("pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req15->as_raw_string(), "[pkgname!?]"); TEST_CHECK_EQUAL(req15->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req15->requirement_met(&env, *id).first); TEST_CHECK(req15->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req16( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req16( parse_elike_use_requirement("pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req16->as_raw_string(), "[pkgname!?]"); TEST_CHECK_EQUAL(req16->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req16->requirement_met(&env, *id).first); TEST_CHECK(! req16->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req17( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req17( parse_elike_use_requirement("-pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req17->as_raw_string(), "[-pkgname!?]"); TEST_CHECK_EQUAL(req17->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req17->requirement_met(&env, *id).first); TEST_CHECK(req17->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req18( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req18( parse_elike_use_requirement("-pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req18->as_raw_string(), "[-pkgname!?]"); TEST_CHECK_EQUAL(req18->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req18->requirement_met(&env, *id).first); TEST_CHECK(req18->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req19( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req19( parse_elike_use_requirement("pkgname!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req19->as_raw_string(), "[pkgname!=]"); TEST_CHECK_EQUAL(req19->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req19->requirement_met(&env, *id).first); TEST_CHECK(req19->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req20( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req20( parse_elike_use_requirement("pkgname!=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps)); TEST_CHECK_EQUAL(req20->as_raw_string(), "[pkgname!=]"); TEST_CHECK_EQUAL(req20->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'"); @@ -723,122 +723,122 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1")); set_conditionals(id, "pkgname"); - std::tr1::shared_ptr<FakePackageID> id2(fake->add_version("cat", "disabled", "1")); + std::shared_ptr<FakePackageID> id2(fake->add_version("cat", "disabled", "1")); set_conditionals(id2, "pkgname"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( parse_elike_use_requirement("pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req1->as_raw_string(), "[pkgname?]"); TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req1->requirement_met(&env, *id).first); TEST_CHECK(! req1->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( parse_elike_use_requirement("pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req2->as_raw_string(), "[pkgname?]"); TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req2->requirement_met(&env, *id).first); TEST_CHECK(req2->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req7( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req7( parse_elike_use_requirement("!pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req7->as_raw_string(), "[!pkgname?]"); TEST_CHECK_EQUAL(req7->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req7->requirement_met(&env, *id).first); TEST_CHECK(req7->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req8( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req8( parse_elike_use_requirement("!pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req8->as_raw_string(), "[!pkgname?]"); TEST_CHECK_EQUAL(req8->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req8->requirement_met(&env, *id).first); TEST_CHECK(req8->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req9( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req9( parse_elike_use_requirement("pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req9->as_raw_string(), "[pkgname=]"); TEST_CHECK_EQUAL(req9->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(req9->requirement_met(&env, *id).first); TEST_CHECK(! req9->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req10( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req10( parse_elike_use_requirement("pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req10->as_raw_string(), "[pkgname=]"); TEST_CHECK_EQUAL(req10->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req10->requirement_met(&env, *id).first); TEST_CHECK(req10->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req11( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req11( parse_elike_use_requirement("!pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req11->as_raw_string(), "[!pkgname=]"); TEST_CHECK_EQUAL(req11->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req11->requirement_met(&env, *id).first); TEST_CHECK(req11->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req12( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req12( parse_elike_use_requirement("!pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req12->as_raw_string(), "[!pkgname=]"); TEST_CHECK_EQUAL(req12->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'"); TEST_CHECK(req12->requirement_met(&env, *id).first); TEST_CHECK(! req12->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req13( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req13( parse_elike_use_requirement("-pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req13->as_raw_string(), "[-pkgname?]"); TEST_CHECK_EQUAL(req13->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req13->requirement_met(&env, *id).first); TEST_CHECK(req13->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req14( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req14( parse_elike_use_requirement("-pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req14->as_raw_string(), "[-pkgname?]"); TEST_CHECK_EQUAL(req14->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req14->requirement_met(&env, *id).first); TEST_CHECK(req14->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req15( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req15( parse_elike_use_requirement("pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req15->as_raw_string(), "[pkgname!?]"); TEST_CHECK_EQUAL(req15->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req15->requirement_met(&env, *id).first); TEST_CHECK(req15->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req16( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req16( parse_elike_use_requirement("pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req16->as_raw_string(), "[pkgname!?]"); TEST_CHECK_EQUAL(req16->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(req16->requirement_met(&env, *id).first); TEST_CHECK(! req16->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req17( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req17( parse_elike_use_requirement("-pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req17->as_raw_string(), "[-pkgname!?]"); TEST_CHECK_EQUAL(req17->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'"); TEST_CHECK(req17->requirement_met(&env, *id).first); TEST_CHECK(req17->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req18( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req18( parse_elike_use_requirement("-pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req18->as_raw_string(), "[-pkgname!?]"); TEST_CHECK_EQUAL(req18->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'"); TEST_CHECK(! req18->requirement_met(&env, *id).first); TEST_CHECK(req18->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req19( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req19( parse_elike_use_requirement("pkgname!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req19->as_raw_string(), "[pkgname!=]"); TEST_CHECK_EQUAL(req19->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'"); TEST_CHECK(! req19->requirement_met(&env, *id).first); TEST_CHECK(req19->requirement_met(&env, *id2).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req20( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req20( parse_elike_use_requirement("pkgname!=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax)); TEST_CHECK_EQUAL(req20->as_raw_string(), "[pkgname!=]"); TEST_CHECK_EQUAL(req20->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'"); @@ -854,34 +854,34 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "pkg1", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "pkg1", "1")); set_conditionals(id, "enabled disabled"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( - parse_elike_use_requirement("missing(+)", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + parse_elike_use_requirement("missing(+)", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing)); TEST_CHECK_EQUAL(req1->as_raw_string(), "[missing(+)]"); TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'missing' enabled, assuming enabled if missing"); TEST_CHECK(req1->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( - parse_elike_use_requirement("missing(-)", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + parse_elike_use_requirement("missing(-)", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing)); TEST_CHECK_EQUAL(req2->as_raw_string(), "[missing(-)]"); TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'missing' enabled, assuming disabled if missing"); TEST_CHECK(! req2->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req3( - parse_elike_use_requirement("-missing(+)", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req3( + parse_elike_use_requirement("-missing(+)", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing)); TEST_CHECK_EQUAL(req3->as_raw_string(), "[-missing(+)]"); TEST_CHECK_EQUAL(req3->as_human_string(), "Flag 'missing' disabled, assuming enabled if missing"); TEST_CHECK(! req3->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req4( - parse_elike_use_requirement("-missing(-)", std::tr1::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing)); + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req4( + parse_elike_use_requirement("-missing(-)", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing)); TEST_CHECK_EQUAL(req4->as_raw_string(), "[-missing(-)]"); TEST_CHECK_EQUAL(req4->as_human_string(), "Flag 'missing' disabled, assuming disabled if missing"); TEST_CHECK(req4->requirement_met(&env, *id).first); @@ -895,21 +895,21 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id(fake->add_version("cat", "pkg1", "1")); + std::shared_ptr<FakePackageID> id(fake->add_version("cat", "pkg1", "1")); set_conditionals(id, "foo:enabled foo:disabled"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( parse_elike_use_requirement("foo:*", id, ELikeUseRequirementOptions() + euro_allow_default_values + euro_allow_self_deps)); TEST_CHECK_EQUAL(req1->as_raw_string(), "[foo:*]"); TEST_CHECK(! req1->requirement_met(&env, *id).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( parse_elike_use_requirement("foo:*=", id, ELikeUseRequirementOptions() + euro_allow_default_values + euro_allow_self_deps)); TEST_CHECK_EQUAL(req2->as_raw_string(), "[foo:*=]"); @@ -924,19 +924,19 @@ namespace test_cases void run() { TestEnvironment env; - const std::tr1::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( + const std::shared_ptr<FakeRepository> fake(new FakeRepository(make_named_values<FakeRepositoryParams>( n::environment() = &env, n::name() = RepositoryName("fake") ))); env.package_database()->add_repository(1, fake); - std::tr1::shared_ptr<FakePackageID> id1(fake->add_version("cat", "pkg1", "1")); + std::shared_ptr<FakePackageID> id1(fake->add_version("cat", "pkg1", "1")); set_conditionals(id1, "foo:enabled foo:disabled"); - std::tr1::shared_ptr<FakePackageID> id2(fake->add_version("cat", "pkg2", "1")); + std::shared_ptr<FakePackageID> id2(fake->add_version("cat", "pkg2", "1")); set_conditionals(id2, "foo:enabled foo:disabled bar:enabled bar:disabled"); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1( parse_elike_use_requirement("foo:*(?)=", id2, ELikeUseRequirementOptions() + euro_allow_default_values + euro_allow_self_deps + euro_allow_default_question_values)); @@ -944,7 +944,7 @@ namespace test_cases TEST_CHECK(req1->requirement_met(&env, *id2).first); TEST_CHECK(req1->requirement_met(&env, *id1).first); - std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( + std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2( parse_elike_use_requirement("bar:*(?)=", id2, ELikeUseRequirementOptions() + euro_allow_default_values + euro_allow_self_deps + euro_allow_default_question_values)); diff --git a/paludis/environment.hh b/paludis/environment.hh index 526fa1c01..424a1aadf 100644 --- a/paludis/environment.hh +++ b/paludis/environment.hh @@ -102,8 +102,8 @@ namespace paludis * have been created yet. */ virtual const Tribool want_choice_enabled( - const std::tr1::shared_ptr<const PackageID> &, - const std::tr1::shared_ptr<const Choice> &, + const std::shared_ptr<const PackageID> &, + const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & ) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; @@ -124,8 +124,8 @@ namespace paludis * \since 0.40 */ virtual const std::string value_for_choice_parameter( - const std::tr1::shared_ptr<const PackageID> &, - const std::tr1::shared_ptr<const Choice> &, + const std::shared_ptr<const PackageID> &, + const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & ) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; @@ -140,9 +140,9 @@ namespace paludis * This is to deal with cases like USE_EXPAND values, where the * repository doesn't know all possible values. */ - virtual std::tr1::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( - const std::tr1::shared_ptr<const PackageID> &, - const std::tr1::shared_ptr<const Choice> & + virtual std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( + const std::shared_ptr<const PackageID> &, + const std::shared_ptr<const Choice> & ) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; @@ -168,7 +168,7 @@ namespace paludis * Used by PackageID implementations. Generally PackageID's masks methods * should be used rather than calling this directly. */ - virtual bool accept_keywords(const std::tr1::shared_ptr<const KeywordNameSet> &, const PackageID &) const + virtual bool accept_keywords(const std::shared_ptr<const KeywordNameSet> &, const PackageID &) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; /** @@ -179,7 +179,7 @@ namespace paludis * Used by PackageID implementations. Generally PackageID's masks methods * should be used rather than calling this directly. */ - virtual const std::tr1::shared_ptr<const Mask> mask_for_breakage(const PackageID &) const + virtual const std::shared_ptr<const Mask> mask_for_breakage(const PackageID &) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; /** @@ -193,7 +193,7 @@ namespace paludis * Used by PackageID implementations. Generally PackageID's masks methods * should be used rather than calling this directly. */ - virtual const std::tr1::shared_ptr<const Mask> mask_for_user(const PackageID &, + virtual const std::shared_ptr<const Mask> mask_for_user(const PackageID &, const bool will_be_used_for_overridden) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; @@ -214,16 +214,16 @@ namespace paludis ///\name Database-related functions ///\{ - virtual std::tr1::shared_ptr<PackageDatabase> package_database() + virtual std::shared_ptr<PackageDatabase> package_database() PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; - virtual std::tr1::shared_ptr<const PackageDatabase> package_database() const + virtual std::shared_ptr<const PackageDatabase> package_database() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; /** * Select some packages. */ - virtual std::tr1::shared_ptr<PackageIDSequence> operator[] (const Selection &) const + virtual std::shared_ptr<PackageIDSequence> operator[] (const Selection &) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; /** @@ -234,7 +234,7 @@ namespace paludis * \since 0.42 */ virtual void add_selection_cache( - const std::tr1::shared_ptr<const SelectionCache> &) = 0; + const std::shared_ptr<const SelectionCache> &) = 0; /** * Remove a selection cache registered using add_selection_cache. @@ -244,7 +244,7 @@ namespace paludis * \since 0.42 */ virtual void remove_selection_cache( - const std::tr1::shared_ptr<const SelectionCache> &) = 0; + const std::shared_ptr<const SelectionCache> &) = 0; /** * Create a repository from a particular file. @@ -257,7 +257,7 @@ namespace paludis * * \since 0.48 */ - virtual const std::tr1::shared_ptr<Repository> repository_from_new_config_file( + virtual const std::shared_ptr<Repository> repository_from_new_config_file( const FSEntry &) PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; ///\} @@ -269,25 +269,25 @@ namespace paludis * Return a collection of bashrc files to be used by the various components * that are implemented in bash. */ - virtual std::tr1::shared_ptr<const FSEntrySequence> bashrc_files() const + virtual std::shared_ptr<const FSEntrySequence> bashrc_files() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; /** * Return directories to search for syncer scripts. */ - virtual std::tr1::shared_ptr<const FSEntrySequence> syncers_dirs() const + virtual std::shared_ptr<const FSEntrySequence> syncers_dirs() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; /** * Return directories to search for fetcher scripts. */ - virtual std::tr1::shared_ptr<const FSEntrySequence> fetchers_dirs() const + virtual std::shared_ptr<const FSEntrySequence> fetchers_dirs() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; /** * Return directories to search for hooks. */ - virtual std::tr1::shared_ptr<const FSEntrySequence> hook_dirs() const + virtual std::shared_ptr<const FSEntrySequence> hook_dirs() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; /** @@ -333,7 +333,7 @@ namespace paludis /** * Return the mirror URI prefixes for a named mirror. */ - virtual std::tr1::shared_ptr<const MirrorsSequence> mirrors(const std::string &) const + virtual std::shared_ptr<const MirrorsSequence> mirrors(const std::string &) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; ///\} @@ -362,13 +362,13 @@ namespace paludis virtual void add_set( const SetName & base_name, const SetName & combined_name, - const std::tr1::function<std::tr1::shared_ptr<const SetSpecTree> ()> & func, + const std::function<std::shared_ptr<const SetSpecTree> ()> & func, const bool combine) const = 0; /** * Return all known named sets. */ - virtual std::tr1::shared_ptr<const SetNameSet> set_names() const + virtual std::shared_ptr<const SetNameSet> set_names() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; /** @@ -376,7 +376,7 @@ namespace paludis * * If the named set is not known, returns a zero pointer. */ - virtual const std::tr1::shared_ptr<const SetSpecTree> set(const SetName &) const + virtual const std::shared_ptr<const SetSpecTree> set(const SetName &) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; ///\} @@ -387,7 +387,7 @@ namespace paludis /** * Default destination candidates for installing packages. */ - virtual std::tr1::shared_ptr<const DestinationsSet> default_destinations() const + virtual std::shared_ptr<const DestinationsSet> default_destinations() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; ///\} @@ -462,13 +462,13 @@ namespace paludis * implementations should not return zero here, but clients should still * check. */ - virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const = 0; + virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const = 0; /** * The config_location_key, if non-zero, specifies the location of the configuration file or directory, * the contents of which depends on the format returned by format_key. */ - virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > config_location_key() const = 0; + virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > config_location_key() const = 0; ///\} @@ -480,7 +480,7 @@ namespace paludis * * \since 0.36 */ - virtual const std::tr1::shared_ptr<OutputManager> create_output_manager( + virtual const std::shared_ptr<OutputManager> create_output_manager( const CreateOutputManagerInfo &) const = 0; /** diff --git a/paludis/environment_factory.cc b/paludis/environment_factory.cc index a1ab75311..9e4e46adb 100644 --- a/paludis/environment_factory.cc +++ b/paludis/environment_factory.cc @@ -30,13 +30,13 @@ #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/distribution.hh> #include <paludis/about.hh> -#include <tr1/unordered_map> +#include <unordered_map> #include <list> #include "config.h" using namespace paludis; -typedef std::tr1::unordered_map<std::string, EnvironmentFactory::CreateFunction> Keys; +typedef std::unordered_map<std::string, EnvironmentFactory::CreateFunction> Keys; namespace paludis { @@ -85,7 +85,7 @@ EnvironmentFactory::~EnvironmentFactory() { } -const std::tr1::shared_ptr<Environment> +const std::shared_ptr<Environment> EnvironmentFactory::create(const std::string & s) const { Context context("When making environment from specification '" + s + "':"); @@ -132,7 +132,7 @@ EnvironmentFactory::create(const std::string & s) const void EnvironmentFactory::add_environment_format( - const std::tr1::shared_ptr<const Set<std::string> > & formats, + const std::shared_ptr<const Set<std::string> > & formats, const CreateFunction & create_function ) { diff --git a/paludis/environment_factory.hh b/paludis/environment_factory.hh index 98065b101..3a8bacb93 100644 --- a/paludis/environment_factory.hh +++ b/paludis/environment_factory.hh @@ -28,8 +28,8 @@ #include <paludis/util/no_type.hh> #include <paludis/util/singleton.hh> #include <paludis/environment-fwd.hh> -#include <tr1/memory> -#include <tr1/functional> +#include <memory> +#include <functional> namespace paludis { @@ -54,7 +54,7 @@ namespace paludis ~EnvironmentFactory(); public: - typedef std::tr1::function<const std::tr1::shared_ptr<Environment>(const std::string &)> CreateFunction; + typedef std::function<const std::shared_ptr<Environment>(const std::string &)> CreateFunction; /** * Create an Environment subclass from the specified spec. @@ -70,7 +70,7 @@ namespace paludis * the supplied string is taken as env (this includes an * empty string). */ - const std::tr1::shared_ptr<Environment> create(const std::string & spec) const + const std::shared_ptr<Environment> create(const std::string & spec) const PALUDIS_ATTRIBUTE((warn_unused_result)); /** @@ -82,7 +82,7 @@ namespace paludis * \param create_function is used to implement EnvironmentFactory::create. */ void add_environment_format( - const std::tr1::shared_ptr<const Set<std::string> > & formats, + const std::shared_ptr<const Set<std::string> > & formats, const CreateFunction & create_function ); }; diff --git a/paludis/environment_implementation.cc b/paludis/environment_implementation.cc index 8370f3c28..0f6f3d9b6 100644 --- a/paludis/environment_implementation.cc +++ b/paludis/environment_implementation.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2005, 2006, 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -27,7 +27,6 @@ #include <paludis/util/make_shared_ptr.hh> #include <paludis/util/system.hh> #include <paludis/util/sequence.hh> -#include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/mutex.hh> #include <paludis/util/member_iterator-impl.hh> #include <paludis/util/wrapped_forward_iterator.hh> @@ -46,12 +45,12 @@ using namespace paludis; namespace { - typedef std::tr1::function<void (const SetName &) > CombiningFunction; + typedef std::function<void (const SetName &) > CombiningFunction; struct CombineSets { - std::tr1::shared_ptr<AllDepSpec> root; - std::tr1::shared_ptr<SetSpecTree> tree; + std::shared_ptr<AllDepSpec> root; + std::shared_ptr<SetSpecTree> tree; void add(const SetName & s) { @@ -70,19 +69,19 @@ namespace { } - std::tr1::shared_ptr<const SetSpecTree> result() const + std::shared_ptr<const SetSpecTree> result() const { return tree; } }; - typedef std::map<SetName, std::pair<std::tr1::function<std::tr1::shared_ptr<const SetSpecTree> ()>, CombiningFunction> > SetsStore; + typedef std::map<SetName, std::pair<std::function<std::shared_ptr<const SetSpecTree> ()>, CombiningFunction> > SetsStore; template <typename F_> struct Cache { F_ func; - std::tr1::shared_ptr<typename std::tr1::remove_reference<typename F_::result_type>::type> result; + std::shared_ptr<typename std::remove_reference<typename F_::result_type>::type> result; Cache(const F_ & f) : func(f) @@ -92,7 +91,7 @@ namespace typename F_::result_type operator() () { if (! result) - result.reset(new typename std::tr1::remove_reference<typename F_::result_type>::type(func())); + result.reset(new typename std::remove_reference<typename F_::result_type>::type(func())); return *result; } }; @@ -110,11 +109,11 @@ namespace paludis struct Implementation<EnvironmentImplementation> { std::map<unsigned, NotifierCallbackFunction> notifier_callbacks; - std::list<std::tr1::shared_ptr<const SelectionCache> > selection_caches; + std::list<std::shared_ptr<const SelectionCache> > selection_caches; mutable Mutex sets_mutex; mutable bool loaded_sets; - std::tr1::shared_ptr<SetNameSet> set_names; + std::shared_ptr<SetNameSet> set_names; SetsStore sets; Implementation() : @@ -135,25 +134,25 @@ EnvironmentImplementation::~EnvironmentImplementation() } -std::tr1::shared_ptr<const FSEntrySequence> +std::shared_ptr<const FSEntrySequence> EnvironmentImplementation::bashrc_files() const { return make_shared_ptr(new FSEntrySequence); } -std::tr1::shared_ptr<const FSEntrySequence> +std::shared_ptr<const FSEntrySequence> EnvironmentImplementation::syncers_dirs() const { - std::tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence); + std::shared_ptr<FSEntrySequence> result(new FSEntrySequence); result->push_back(FSEntry(DATADIR "/paludis/syncers")); result->push_back(FSEntry(LIBEXECDIR "/paludis/syncers")); return result; } -std::tr1::shared_ptr<const FSEntrySequence> +std::shared_ptr<const FSEntrySequence> EnvironmentImplementation::fetchers_dirs() const { - std::tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence); + std::shared_ptr<FSEntrySequence> result(new FSEntrySequence); std::string fetchers_dir(getenv_with_default("PALUDIS_FETCHERS_DIR", "")); if (fetchers_dir.empty()) { @@ -165,10 +164,10 @@ EnvironmentImplementation::fetchers_dirs() const return result; } -std::tr1::shared_ptr<const DestinationsSet> +std::shared_ptr<const DestinationsSet> EnvironmentImplementation::default_destinations() const { - std::tr1::shared_ptr<DestinationsSet> result(new DestinationsSet); + std::shared_ptr<DestinationsSet> result(new DestinationsSet); for (PackageDatabase::RepositoryConstIterator r(package_database()->begin_repositories()), r_end(package_database()->end_repositories()) ; @@ -193,7 +192,7 @@ EnvironmentImplementation::is_paludis_package(const QualifiedPackageName & n) co return stringify(n) == (*DistributionData::get_instance()->distribution_from_string(distribution())).paludis_package(); } -std::tr1::shared_ptr<PackageIDSequence> +std::shared_ptr<PackageIDSequence> EnvironmentImplementation::operator[] (const Selection & selection) const { if (_imp->selection_caches.empty()) @@ -229,13 +228,13 @@ EnvironmentImplementation::trigger_notifier_callback(const NotifierCallbackEvent } void -EnvironmentImplementation::add_selection_cache(const std::tr1::shared_ptr<const SelectionCache> & c) +EnvironmentImplementation::add_selection_cache(const std::shared_ptr<const SelectionCache> & c) { _imp->selection_caches.push_back(c); } void -EnvironmentImplementation::remove_selection_cache(const std::tr1::shared_ptr<const SelectionCache> & c) +EnvironmentImplementation::remove_selection_cache(const std::shared_ptr<const SelectionCache> & c) { _imp->selection_caches.remove(c); } @@ -244,7 +243,7 @@ void EnvironmentImplementation::add_set( const SetName & name, const SetName & combined_name, - const std::tr1::function<std::tr1::shared_ptr<const SetSpecTree> ()> & func, + const std::function<std::shared_ptr<const SetSpecTree> ()> & func, const bool combine) const { Lock lock(_imp->sets_mutex); @@ -255,10 +254,10 @@ EnvironmentImplementation::add_set( if (! _imp->sets.insert(std::make_pair(combined_name, std::make_pair(cache(func), CombiningFunction()))).second) throw DuplicateSetError(combined_name); - std::tr1::shared_ptr<CombineSets> c_s(new CombineSets); + std::shared_ptr<CombineSets> c_s(new CombineSets); CombiningFunction c_func(_imp->sets.insert(std::make_pair(name, std::make_pair( - std::tr1::bind(&CombineSets::result, c_s), - std::tr1::bind(&CombineSets::add, c_s, std::tr1::placeholders::_1) + std::bind(&CombineSets::result, c_s), + std::bind(&CombineSets::add, c_s, std::placeholders::_1) ))).first->second.second); if (! c_func) throw DuplicateSetError(name); @@ -271,7 +270,7 @@ EnvironmentImplementation::add_set( } } -std::tr1::shared_ptr<const SetNameSet> +std::shared_ptr<const SetNameSet> EnvironmentImplementation::set_names() const { Lock lock(_imp->sets_mutex); @@ -280,7 +279,7 @@ EnvironmentImplementation::set_names() const return _imp->set_names; } -const std::tr1::shared_ptr<const SetSpecTree> +const std::shared_ptr<const SetSpecTree> EnvironmentImplementation::set(const SetName & s) const { Lock lock(_imp->sets_mutex); @@ -315,12 +314,12 @@ EnvironmentImplementation::_need_sets() const namespace { - std::tr1::shared_ptr<const SetSpecTree> make_everything_set() + std::shared_ptr<const SetSpecTree> make_everything_set() { Log::get_instance()->message("environment_implementation.everything_deprecated", ll_warning, lc_context) << "The 'everything' set is deprecated. Use either 'installed-packages' or 'installed-slots' instead"; - std::tr1::shared_ptr<SetSpecTree> result(new SetSpecTree(make_shared_ptr(new AllDepSpec))); + std::shared_ptr<SetSpecTree> result(new SetSpecTree(make_shared_ptr(new AllDepSpec))); result->root()->append(make_shared_ptr(new NamedSetDepSpec(SetName("installed-packages")))); return result; } @@ -349,7 +348,7 @@ EnvironmentImplementation::populate_standard_sets() const namespace { - std::tr1::shared_ptr<const SetSpecTree> make_empty_set() + std::shared_ptr<const SetSpecTree> make_empty_set() { return make_shared_ptr(new SetSpecTree(make_shared_ptr(new AllDepSpec))); } diff --git a/paludis/environment_implementation.hh b/paludis/environment_implementation.hh index 50e722c25..b6df7d41e 100644 --- a/paludis/environment_implementation.hh +++ b/paludis/environment_implementation.hh @@ -70,16 +70,16 @@ namespace paludis ///\} - virtual std::tr1::shared_ptr<const FSEntrySequence> bashrc_files() const + virtual std::shared_ptr<const FSEntrySequence> bashrc_files() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::tr1::shared_ptr<const FSEntrySequence> syncers_dirs() const + virtual std::shared_ptr<const FSEntrySequence> syncers_dirs() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::tr1::shared_ptr<const FSEntrySequence> fetchers_dirs() const + virtual std::shared_ptr<const FSEntrySequence> fetchers_dirs() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::tr1::shared_ptr<const DestinationsSet> default_destinations() const + virtual std::shared_ptr<const DestinationsSet> default_destinations() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual std::string distribution() const @@ -88,7 +88,7 @@ namespace paludis virtual bool is_paludis_package(const QualifiedPackageName &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::tr1::shared_ptr<PackageIDSequence> operator[] (const Selection &) const + virtual std::shared_ptr<PackageIDSequence> operator[] (const Selection &) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual NotifierCallbackID add_notifier_callback(const NotifierCallbackFunction &); @@ -100,20 +100,20 @@ namespace paludis virtual void add_set( const SetName &, const SetName &, - const std::tr1::function<std::tr1::shared_ptr<const SetSpecTree> ()> &, + const std::function<std::shared_ptr<const SetSpecTree> ()> &, const bool combine) const; - virtual std::tr1::shared_ptr<const SetNameSet> set_names() const + virtual std::shared_ptr<const SetNameSet> set_names() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::tr1::shared_ptr<const SetSpecTree> set(const SetName &) const + virtual const std::shared_ptr<const SetSpecTree> set(const SetName &) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual void add_selection_cache( - const std::tr1::shared_ptr<const SelectionCache> &); + const std::shared_ptr<const SelectionCache> &); virtual void remove_selection_cache( - const std::tr1::shared_ptr<const SelectionCache> &); + const std::shared_ptr<const SelectionCache> &); }; class PALUDIS_VISIBLE DuplicateSetError : diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc index 721dee340..8567382ab 100644 --- a/paludis/environments/no_config/no_config_environment.cc +++ b/paludis/environments/no_config/no_config_environment.cc @@ -43,8 +43,8 @@ #include <paludis/literal_metadata_key.hh> #include <paludis/repository_factory.hh> #include <paludis/choice.hh> -#include <tr1/unordered_map> -#include <tr1/functional> +#include <unordered_map> +#include <functional> #include <algorithm> #include <set> #include <list> @@ -68,16 +68,16 @@ namespace paludis bool accept_unstable; bool is_vdb; - std::tr1::shared_ptr<Repository> main_repo; - std::tr1::shared_ptr<Repository> master_repo; - std::list<std::tr1::shared_ptr<Repository> > extra_repos; + std::shared_ptr<Repository> main_repo; + std::shared_ptr<Repository> master_repo; + std::list<std::shared_ptr<Repository> > extra_repos; std::string paludis_command; - std::tr1::shared_ptr<PackageDatabase> package_database; + std::shared_ptr<PackageDatabase> package_database; - std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > format_key; - std::tr1::shared_ptr<LiteralMetadataValueKey<FSEntry> > repository_dir_key; + std::shared_ptr<LiteralMetadataValueKey<std::string> > format_key; + std::shared_ptr<LiteralMetadataValueKey<FSEntry> > repository_dir_key; Implementation(NoConfigEnvironment * const env, const no_config_environment::Params & params); void initialise(NoConfigEnvironment * const env); @@ -143,7 +143,7 @@ namespace throw ConfigurationError("Can't work out what kind of repository this is"); } - std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m, + std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m, const std::string & k) { Map<std::string, std::string>::ConstIterator mm(m->find(k)); @@ -196,7 +196,7 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env) repository_dirs.insert(std::make_pair(*d, false)); } - std::tr1::unordered_map<RepositoryName, std::tr1::function<std::string (const std::string &)>, + std::unordered_map<RepositoryName, std::function<std::string (const std::string &)>, Hash<RepositoryName> > repo_configs; for (std::map<FSEntry, bool>::const_iterator r(repository_dirs.begin()), r_end(repository_dirs.end()) ; @@ -204,7 +204,7 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env) { Context local_context("When reading repository at location '" + stringify(r->first) + "':"); - std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>); + std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>); if (params.extra_params()) std::copy(params.extra_params()->begin(), params.extra_params()->end(), keys->inserter()); @@ -226,8 +226,8 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env) if ((r->first / "metadata" / "profiles_desc.conf").exists()) keys->insert("layout", "exheres"); - std::tr1::function<std::string (const std::string &)> repo_func( - std::tr1::bind(&from_keys, keys, std::tr1::placeholders::_1)); + std::function<std::string (const std::string &)> repo_func( + std::bind(&from_keys, keys, std::placeholders::_1)); RepositoryName name(RepositoryFactory::get_instance()->name(env, repo_func)); if (ignored_one && r->second && stringify(name) == params.master_repository_name()) @@ -245,14 +245,14 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env) /* work out order for repository creation */ DirectedGraph<RepositoryName, bool> repository_deps; - std::for_each(first_iterator(repo_configs.begin()), first_iterator(repo_configs.end()), std::tr1::bind( - std::tr1::mem_fn(&DirectedGraph<RepositoryName, bool>::add_node), - &repository_deps, std::tr1::placeholders::_1)); + std::for_each(first_iterator(repo_configs.begin()), first_iterator(repo_configs.end()), std::bind( + std::mem_fn(&DirectedGraph<RepositoryName, bool>::add_node), + &repository_deps, std::placeholders::_1)); - for (std::tr1::unordered_map<RepositoryName, std::tr1::function<std::string (const std::string &)>, Hash<RepositoryName> >::const_iterator + for (std::unordered_map<RepositoryName, std::function<std::string (const std::string &)>, Hash<RepositoryName> >::const_iterator r(repo_configs.begin()), r_end(repo_configs.end()) ; r != r_end ; ++r) { - std::tr1::shared_ptr<const RepositoryNameSet> deps(RepositoryFactory::get_instance()->dependencies( + std::shared_ptr<const RepositoryNameSet> deps(RepositoryFactory::get_instance()->dependencies( env, r->second)); for (RepositoryNameSet::ConstIterator d(deps->begin()), d_end(deps->end()) ; d != d_end ; ++d) @@ -279,12 +279,12 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env) for (std::list<RepositoryName>::const_iterator o(ordered_repos.begin()), o_end(ordered_repos.end()) ; o != o_end ; ++o) { - std::tr1::unordered_map<RepositoryName, std::tr1::function<std::string (const std::string &)>, Hash<RepositoryName> >::const_iterator + std::unordered_map<RepositoryName, std::function<std::string (const std::string &)>, Hash<RepositoryName> >::const_iterator c(repo_configs.find(*o)); if (c == repo_configs.end()) throw InternalError(PALUDIS_HERE, "*o not in repo_configs"); - std::tr1::shared_ptr<Repository> repo(RepositoryFactory::get_instance()->create(env, c->second)); + std::shared_ptr<Repository> repo(RepositoryFactory::get_instance()->create(env, c->second)); if (repo->name() == main_repository_name) { main_repo = repo; @@ -313,18 +313,18 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env) throw ConfigurationError("Can't find repository '" + params.master_repository_name() + "'"); #ifdef ENABLE_VIRTUALS_REPOSITORY - std::tr1::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>); + std::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>); v_keys->insert("format", "virtuals"); if ((*DistributionData::get_instance()->distribution_from_string(env->distribution())).support_old_style_virtuals()) package_database->add_repository(-2, RepositoryFactory::get_instance()->create(env, - std::tr1::bind(from_keys, v_keys, std::tr1::placeholders::_1))); + std::bind(from_keys, v_keys, std::placeholders::_1))); #endif } else { Log::get_instance()->message("no_config_environment.vdb_detected", ll_debug, lc_context) << "VDB, using vdb_db"; - std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>); + std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>); if (params.extra_params()) std::copy(params.extra_params()->begin(), params.extra_params()->end(), keys->inserter()); @@ -334,9 +334,9 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env) keys->insert("location", stringify(top_level_dir.realpath())); package_database->add_repository(1, RepositoryFactory::get_instance()->create(env, - std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1))); + std::bind(from_keys, keys, std::placeholders::_1))); - std::tr1::shared_ptr<Map<std::string, std::string> > iv_keys( + std::shared_ptr<Map<std::string, std::string> > iv_keys( new Map<std::string, std::string>); iv_keys->insert("root", "/"); iv_keys->insert("format", "installed_virtuals"); @@ -344,7 +344,7 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env) #ifdef ENABLE_VIRTUALS_REPOSITORY if ((*DistributionData::get_instance()->distribution_from_string(env->distribution())).support_old_style_virtuals()) package_database->add_repository(-2, RepositoryFactory::get_instance()->create(env, - std::tr1::bind(from_keys, iv_keys, std::tr1::placeholders::_1))); + std::bind(from_keys, iv_keys, std::placeholders::_1))); #endif } } @@ -392,37 +392,37 @@ NoConfigEnvironment::set_accept_unstable(const bool value) (*it)->invalidate_masks(); } -std::tr1::shared_ptr<Repository> +std::shared_ptr<Repository> NoConfigEnvironment::main_repository() { return _imp->main_repo; } -std::tr1::shared_ptr<const Repository> +std::shared_ptr<const Repository> NoConfigEnvironment::main_repository() const { return _imp->main_repo; } -std::tr1::shared_ptr<Repository> +std::shared_ptr<Repository> NoConfigEnvironment::master_repository() { return _imp->master_repo; } -std::tr1::shared_ptr<const Repository> +std::shared_ptr<const Repository> NoConfigEnvironment::master_repository() const { return _imp->master_repo; } -std::tr1::shared_ptr<PackageDatabase> +std::shared_ptr<PackageDatabase> NoConfigEnvironment::package_database() { return _imp->package_database; } -std::tr1::shared_ptr<const PackageDatabase> +std::shared_ptr<const PackageDatabase> NoConfigEnvironment::package_database() const { return _imp->package_database; @@ -441,7 +441,7 @@ NoConfigEnvironment::set_paludis_command(const std::string & s) } bool -NoConfigEnvironment::accept_keywords(const std::tr1::shared_ptr<const KeywordNameSet> & keywords, +NoConfigEnvironment::accept_keywords(const std::shared_ptr<const KeywordNameSet> & keywords, const PackageID &) const { if (_imp->is_vdb) @@ -502,16 +502,16 @@ NoConfigEnvironment::unmasked_by_user(const PackageID &) const return false; } -const std::tr1::shared_ptr<const Mask> +const std::shared_ptr<const Mask> NoConfigEnvironment::mask_for_breakage(const PackageID &) const { - return std::tr1::shared_ptr<const Mask>(); + return std::shared_ptr<const Mask>(); } -const std::tr1::shared_ptr<const Mask> +const std::shared_ptr<const Mask> NoConfigEnvironment::mask_for_user(const PackageID &, const bool) const { - return std::tr1::shared_ptr<const Mask>(); + return std::shared_ptr<const Mask>(); } uid_t @@ -526,7 +526,7 @@ NoConfigEnvironment::reduced_gid() const return getgid(); } -std::tr1::shared_ptr<const MirrorsSequence> +std::shared_ptr<const MirrorsSequence> NoConfigEnvironment::mirrors(const std::string &) const { return make_shared_ptr(new MirrorsSequence); @@ -550,7 +550,7 @@ NoConfigEnvironment::perform_hook(const Hook &) const return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = ""); } -std::tr1::shared_ptr<const FSEntrySequence> +std::shared_ptr<const FSEntrySequence> NoConfigEnvironment::hook_dirs() const { return make_shared_ptr(new FSEntrySequence); @@ -561,22 +561,22 @@ NoConfigEnvironment::need_keys_added() const { } -const std::tr1::shared_ptr<const MetadataValueKey<std::string> > +const std::shared_ptr<const MetadataValueKey<std::string> > NoConfigEnvironment::format_key() const { return _imp->format_key; } -const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > +const std::shared_ptr<const MetadataValueKey<FSEntry> > NoConfigEnvironment::config_location_key() const { - return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >(); + return std::shared_ptr<const MetadataValueKey<FSEntry> >(); } const Tribool NoConfigEnvironment::want_choice_enabled( - const std::tr1::shared_ptr<const PackageID> &, - const std::tr1::shared_ptr<const Choice> &, + const std::shared_ptr<const PackageID> &, + const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & ) const { @@ -585,24 +585,24 @@ NoConfigEnvironment::want_choice_enabled( const std::string NoConfigEnvironment::value_for_choice_parameter( - const std::tr1::shared_ptr<const PackageID> &, - const std::tr1::shared_ptr<const Choice> &, + const std::shared_ptr<const PackageID> &, + const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & ) const { return ""; } -std::tr1::shared_ptr<const Set<UnprefixedChoiceName> > +std::shared_ptr<const Set<UnprefixedChoiceName> > NoConfigEnvironment::known_choice_value_names( - const std::tr1::shared_ptr<const PackageID> &, - const std::tr1::shared_ptr<const Choice> & + const std::shared_ptr<const PackageID> &, + const std::shared_ptr<const Choice> & ) const { return make_shared_ptr(new Set<UnprefixedChoiceName>); } -const std::tr1::shared_ptr<OutputManager> +const std::shared_ptr<OutputManager> NoConfigEnvironment::create_output_manager(const CreateOutputManagerInfo &) const { return make_shared_ptr(new StandardOutputManager); @@ -613,7 +613,7 @@ NoConfigEnvironment::populate_sets() const { } -const std::tr1::shared_ptr<Repository> +const std::shared_ptr<Repository> NoConfigEnvironment::repository_from_new_config_file(const FSEntry &) { throw InternalError(PALUDIS_HERE, "can't create repositories on the fly for NoConfigEnvironment"); diff --git a/paludis/environments/no_config/no_config_environment.hh b/paludis/environments/no_config/no_config_environment.hh index cda582e0d..902499129 100644 --- a/paludis/environments/no_config/no_config_environment.hh +++ b/paludis/environments/no_config/no_config_environment.hh @@ -57,8 +57,8 @@ namespace paludis NamedValue<n::accept_unstable, bool> accept_unstable; NamedValue<n::disable_metadata_cache, bool> disable_metadata_cache; NamedValue<n::extra_accept_keywords, std::string> extra_accept_keywords; - NamedValue<n::extra_params, std::tr1::shared_ptr<Map<std::string, std::string> > > extra_params; - NamedValue<n::extra_repository_dirs, std::tr1::shared_ptr<const FSEntrySequence> > extra_repository_dirs; + NamedValue<n::extra_params, std::shared_ptr<Map<std::string, std::string> > > extra_params; + NamedValue<n::extra_repository_dirs, std::shared_ptr<const FSEntrySequence> > extra_repository_dirs; NamedValue<n::master_repository_name, std::string> master_repository_name; /** @@ -125,49 +125,49 @@ namespace paludis /** * Fetch our 'main' repository. */ - std::tr1::shared_ptr<Repository> main_repository(); + std::shared_ptr<Repository> main_repository(); /** * Fetch our 'main' repository. */ - std::tr1::shared_ptr<const Repository> main_repository() const; + std::shared_ptr<const Repository> main_repository() const; /** * Fetch our 'master' repository (may be zero). */ - std::tr1::shared_ptr<Repository> master_repository(); + std::shared_ptr<Repository> master_repository(); /** * Fetch our 'master' repository (may be zero). */ - std::tr1::shared_ptr<const Repository> master_repository() const; + std::shared_ptr<const Repository> master_repository() const; ///\} virtual const Tribool want_choice_enabled( - const std::tr1::shared_ptr<const PackageID> &, - const std::tr1::shared_ptr<const Choice> &, + const std::shared_ptr<const PackageID> &, + const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & ) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual const std::string value_for_choice_parameter( - const std::tr1::shared_ptr<const PackageID> &, - const std::tr1::shared_ptr<const Choice> &, + const std::shared_ptr<const PackageID> &, + const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & ) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::tr1::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( - const std::tr1::shared_ptr<const PackageID> &, - const std::tr1::shared_ptr<const Choice> & + virtual std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( + const std::shared_ptr<const PackageID> &, + const std::shared_ptr<const Choice> & ) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::tr1::shared_ptr<PackageDatabase> package_database() + virtual std::shared_ptr<PackageDatabase> package_database() PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::tr1::shared_ptr<const PackageDatabase> package_database() const + virtual std::shared_ptr<const PackageDatabase> package_database() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual std::string paludis_command() const @@ -178,19 +178,19 @@ namespace paludis virtual bool accept_license(const std::string &, const PackageID &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool accept_keywords(const std::tr1::shared_ptr<const KeywordNameSet> &, const PackageID &) const + virtual bool accept_keywords(const std::shared_ptr<const KeywordNameSet> &, const PackageID &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::tr1::shared_ptr<const Mask> mask_for_breakage(const PackageID &) const + virtual const std::shared_ptr<const Mask> mask_for_breakage(const PackageID &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::tr1::shared_ptr<const Mask> mask_for_user(const PackageID &, const bool will_be_used_for_overridden) const + virtual const std::shared_ptr<const Mask> mask_for_user(const PackageID &, const bool will_be_used_for_overridden) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual bool unmasked_by_user(const PackageID &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::tr1::shared_ptr<const FSEntrySequence> hook_dirs() const + virtual std::shared_ptr<const FSEntrySequence> hook_dirs() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual const FSEntry root() const; @@ -199,7 +199,7 @@ namespace paludis virtual gid_t reduced_gid() const; - virtual std::tr1::shared_ptr<const MirrorsSequence> mirrors(const std::string &) const + virtual std::shared_ptr<const MirrorsSequence> mirrors(const std::string &) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual HookResult perform_hook(const Hook &) const @@ -213,13 +213,13 @@ namespace paludis virtual bool remove_from_world(const SetName &) const; - virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > config_location_key() const; + virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; + virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > config_location_key() const; - virtual const std::tr1::shared_ptr<OutputManager> create_output_manager( + virtual const std::shared_ptr<OutputManager> create_output_manager( const CreateOutputManagerInfo &) const; - virtual const std::tr1::shared_ptr<Repository> repository_from_new_config_file( + virtual const std::shared_ptr<Repository> repository_from_new_config_file( const FSEntry &) PALUDIS_ATTRIBUTE((noreturn)); virtual void update_config_files_for_package_move( diff --git a/paludis/environments/no_config/no_config_environment_TEST.cc b/paludis/environments/no_config/no_config_environment_TEST.cc index 0b2f2bc87..dd16b47af 100644 --- a/paludis/environments/no_config/no_config_environment_TEST.cc +++ b/paludis/environments/no_config/no_config_environment_TEST.cc @@ -40,7 +40,7 @@ namespace test_cases n::accept_unstable() = false, n::disable_metadata_cache() = false, n::extra_accept_keywords() = "", - n::extra_params() = std::tr1::shared_ptr<Map<std::string, std::string> >(), + n::extra_params() = std::shared_ptr<Map<std::string, std::string> >(), n::extra_repository_dirs() = make_shared_ptr(new FSEntrySequence), n::master_repository_name() = "", n::profiles_if_not_auto() = "", diff --git a/paludis/environments/no_config/registration.cc b/paludis/environments/no_config/registration.cc index c1d7e1950..89831ba1c 100644 --- a/paludis/environments/no_config/registration.cc +++ b/paludis/environments/no_config/registration.cc @@ -33,15 +33,15 @@ using namespace paludis; namespace { - std::tr1::shared_ptr<Environment> + std::shared_ptr<Environment> make_no_config_environment(const std::string & s) { Context context("When making NoConfigEnvironment using spec '" + s + "':"); - std::tr1::shared_ptr<Map<std::string, std::string> > extra_params( + std::shared_ptr<Map<std::string, std::string> > extra_params( make_shared_ptr(new Map<std::string, std::string>)); FSEntry repository_dir(FSEntry::cwd()); - std::tr1::shared_ptr<FSEntrySequence> extra_repository_dirs(new FSEntrySequence); + std::shared_ptr<FSEntrySequence> extra_repository_dirs(new FSEntrySequence); FSEntry write_cache("/var/empty"); std::string profile; std::string master_repository_name; @@ -88,7 +88,7 @@ namespace } } - return std::tr1::shared_ptr<Environment>(new NoConfigEnvironment( + return std::shared_ptr<Environment>(new NoConfigEnvironment( make_named_values<no_config_environment::Params>( n::accept_unstable() = accept_unstable, n::disable_metadata_cache() = disable_metadata_cache, @@ -115,7 +115,7 @@ namespace paludis void register_environment<environment_groups::no_config>(const environment_groups::no_config * const, EnvironmentFactory * const factory) { - std::tr1::shared_ptr<Set<std::string> > no_config_formats(new Set<std::string>); + std::shared_ptr<Set<std::string> > no_config_formats(new Set<std::string>); no_config_formats->insert("no_config"); no_config_formats->insert("no-config"); factory->add_environment_format(no_config_formats, &make_no_config_environment); diff --git a/paludis/environments/paludis/bashable_conf.cc b/paludis/environments/paludis/bashable_conf.cc index 9c08aef2c..b7095f929 100644 --- a/paludis/environments/paludis/bashable_conf.cc +++ b/paludis/environments/paludis/bashable_conf.cc @@ -26,13 +26,13 @@ #include <paludis/util/system.hh> #include <paludis/util/map.hh> #include <paludis/util/wrapped_forward_iterator.hh> -#include <tr1/functional> +#include <functional> using namespace paludis; using namespace paludis::paludis_environment; std::string defined_vars_to_kv_func( - const std::tr1::shared_ptr<const Map<std::string, std::string> > v, + const std::shared_ptr<const Map<std::string, std::string> > v, const KeyValueConfigFile &, const std::string & k) { @@ -42,12 +42,12 @@ std::string defined_vars_to_kv_func( return ""; } -std::tr1::shared_ptr<LineConfigFile> +std::shared_ptr<LineConfigFile> paludis::paludis_environment::make_bashable_conf(const FSEntry & f, const LineConfigFileOptions & o) { Context context("When making a config file out of '" + stringify(f) + "':"); - std::tr1::shared_ptr<LineConfigFile> result; + std::shared_ptr<LineConfigFile> result; if (is_file_with_extension(f, ".bash", IsFileWithOptions())) { @@ -73,14 +73,14 @@ paludis::paludis_environment::make_bashable_conf(const FSEntry & f, const LineCo return result; } -std::tr1::shared_ptr<KeyValueConfigFile> +std::shared_ptr<KeyValueConfigFile> paludis::paludis_environment::make_bashable_kv_conf(const FSEntry & f, - const std::tr1::shared_ptr<const Map<std::string, std::string> > & predefined_variables, + const std::shared_ptr<const Map<std::string, std::string> > & predefined_variables, const KeyValueConfigFileOptions & o) { Context context("When making a key=value config file out of '" + stringify(f) + "':"); - std::tr1::shared_ptr<KeyValueConfigFile> result; + std::shared_ptr<KeyValueConfigFile> result; if (is_file_with_extension(f, ".bash", IsFileWithOptions())) { @@ -107,11 +107,11 @@ paludis::paludis_environment::make_bashable_kv_conf(const FSEntry & f, else { result.reset(new KeyValueConfigFile(f, o, - std::tr1::bind( + std::bind( &defined_vars_to_kv_func, predefined_variables, - std::tr1::placeholders::_1, - std::tr1::placeholders::_2), + std::placeholders::_1, + std::placeholders::_2), &KeyValueConfigFile::no_transformation)); } diff --git a/paludis/environments/paludis/bashable_conf.hh b/paludis/environments/paludis/bashable_conf.hh index 692622f87..372753d7f 100644 --- a/paludis/environments/paludis/bashable_conf.hh +++ b/paludis/environments/paludis/bashable_conf.hh @@ -23,20 +23,20 @@ #include <paludis/util/fs_entry-fwd.hh> #include <paludis/util/config_file-fwd.hh> #include <paludis/util/map-fwd.hh> -#include <tr1/memory> +#include <memory> #include <string> namespace paludis { namespace paludis_environment { - std::tr1::shared_ptr<LineConfigFile> make_bashable_conf( + std::shared_ptr<LineConfigFile> make_bashable_conf( const FSEntry &, const LineConfigFileOptions &); - std::tr1::shared_ptr<KeyValueConfigFile> make_bashable_kv_conf( + std::shared_ptr<KeyValueConfigFile> make_bashable_kv_conf( const FSEntry &, - const std::tr1::shared_ptr<const Map<std::string, std::string> > &, + const std::shared_ptr<const Map<std::string, std::string> > &, const KeyValueConfigFileOptions &); } } diff --git a/paludis/environments/paludis/extra_distribution_data.cc b/paludis/environments/paludis/extra_distribution_data.cc index 6c26eb0a2..7f4591e44 100644 --- a/paludis/environments/paludis/extra_distribution_data.cc +++ b/paludis/environments/paludis/extra_distribution_data.cc @@ -37,7 +37,7 @@ namespace paludis return "paludis.conf"; } - static std::tr1::shared_ptr<PaludisDistribution> make_data(const std::tr1::shared_ptr<const KeyValueConfigFile> & k) + static std::shared_ptr<PaludisDistribution> make_data(const std::shared_ptr<const KeyValueConfigFile> & k) { return make_shared_ptr(new PaludisDistribution(make_named_values<PaludisDistribution>( n::bashrc_filename() = k->get("bashrc_filename"), diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc index c1de53dc0..4a0502772 100644 --- a/paludis/environments/paludis/keywords_conf.cc +++ b/paludis/environments/paludis/keywords_conf.cc @@ -38,7 +38,7 @@ #include <paludis/util/set.hh> #include <paludis/util/hashes.hh> #include <paludis/util/make_shared_ptr.hh> -#include <tr1/unordered_map> +#include <unordered_map> #include <list> #include <vector> #include <map> @@ -47,12 +47,12 @@ using namespace paludis; using namespace paludis::paludis_environment; typedef std::list<KeywordName> KeywordsList; -typedef std::map<std::tr1::shared_ptr<const PackageDepSpec>, KeywordsList> PDSToKeywordsList; -typedef std::pair<std::tr1::shared_ptr<const SetSpecTree>, KeywordsList> SetNameEntry; +typedef std::map<std::shared_ptr<const PackageDepSpec>, KeywordsList> PDSToKeywordsList; +typedef std::pair<std::shared_ptr<const SetSpecTree>, KeywordsList> SetNameEntry; -typedef std::tr1::unordered_map<QualifiedPackageName, PDSToKeywordsList, Hash<QualifiedPackageName> > SpecificMap; +typedef std::unordered_map<QualifiedPackageName, PDSToKeywordsList, Hash<QualifiedPackageName> > SpecificMap; typedef PDSToKeywordsList UnspecificMap; -typedef std::tr1::unordered_map<SetName, SetNameEntry, Hash<SetName> > NamedSetMap; +typedef std::unordered_map<SetName, SetNameEntry, Hash<SetName> > NamedSetMap; namespace paludis { @@ -87,7 +87,7 @@ KeywordsConf::add(const FSEntry & filename) { Context context("When adding source '" + stringify(filename) + "' as a keywords file:"); - std::tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions())); + std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions())); if (! f) return; @@ -102,7 +102,7 @@ KeywordsConf::add(const FSEntry & filename) try { - std::tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(parse_user_package_dep_spec( + std::shared_ptr<PackageDepSpec> d(new PackageDepSpec(parse_user_package_dep_spec( tokens.at(0), _imp->env, UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation + updso_throw_if_set))); if (d->package_ptr()) @@ -133,7 +133,7 @@ KeywordsConf::add(const FSEntry & filename) } bool -KeywordsConf::query(const std::tr1::shared_ptr<const KeywordNameSet> & k, const PackageID & e) const +KeywordsConf::query(const std::shared_ptr<const KeywordNameSet> & k, const PackageID & e) const { static const KeywordName star_keyword("*"); static const KeywordName minus_star_keyword("-*"); diff --git a/paludis/environments/paludis/keywords_conf.hh b/paludis/environments/paludis/keywords_conf.hh index ee736bb06..3f94ae419 100644 --- a/paludis/environments/paludis/keywords_conf.hh +++ b/paludis/environments/paludis/keywords_conf.hh @@ -60,7 +60,7 @@ namespace paludis /** * Query a collection of keywords. */ - bool query(const std::tr1::shared_ptr<const KeywordNameSet> &, const PackageID &) const; + bool query(const std::shared_ptr<const KeywordNameSet> &, const PackageID &) const; }; } } diff --git a/paludis/environments/paludis/licenses_conf.cc b/paludis/environments/paludis/licenses_conf.cc index ce642d20b..e8bcc37d0 100644 --- a/paludis/environments/paludis/licenses_conf.cc +++ b/paludis/environments/paludis/licenses_conf.cc @@ -37,7 +37,7 @@ #include <paludis/util/iterator_funcs.hh> #include <paludis/util/hashes.hh> #include <paludis/util/make_shared_ptr.hh> -#include <tr1/unordered_map> +#include <unordered_map> #include <list> #include <vector> #include <map> @@ -46,12 +46,12 @@ using namespace paludis; using namespace paludis::paludis_environment; typedef std::list<std::string> LicensesList; -typedef std::map<std::tr1::shared_ptr<const PackageDepSpec>, LicensesList> PDSToLicensesList; -typedef std::pair<std::tr1::shared_ptr<const SetSpecTree>, LicensesList> SetNameEntry; +typedef std::map<std::shared_ptr<const PackageDepSpec>, LicensesList> PDSToLicensesList; +typedef std::pair<std::shared_ptr<const SetSpecTree>, LicensesList> SetNameEntry; -typedef std::tr1::unordered_map<QualifiedPackageName, PDSToLicensesList, Hash<QualifiedPackageName> > SpecificMap; +typedef std::unordered_map<QualifiedPackageName, PDSToLicensesList, Hash<QualifiedPackageName> > SpecificMap; typedef PDSToLicensesList UnspecificMap; -typedef std::tr1::unordered_map<SetName, SetNameEntry, Hash<SetName> > NamedSetMap; +typedef std::unordered_map<SetName, SetNameEntry, Hash<SetName> > NamedSetMap; namespace paludis { @@ -86,7 +86,7 @@ LicensesConf::add(const FSEntry & filename) { Context context("When adding source '" + stringify(filename) + "' as a licenses file:"); - std::tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions())); + std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions())); if (! f) return; @@ -101,7 +101,7 @@ LicensesConf::add(const FSEntry & filename) try { - std::tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(parse_user_package_dep_spec( + std::shared_ptr<PackageDepSpec> d(new PackageDepSpec(parse_user_package_dep_spec( tokens.at(0), _imp->env, UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation + updso_throw_if_set))); if (d->package_ptr()) diff --git a/paludis/environments/paludis/mirrors_conf.cc b/paludis/environments/paludis/mirrors_conf.cc index 3e7e9f892..f3d0820fc 100644 --- a/paludis/environments/paludis/mirrors_conf.cc +++ b/paludis/environments/paludis/mirrors_conf.cc @@ -30,15 +30,15 @@ #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/wrapped_output_iterator.hh> #include <paludis/util/hashes.hh> -#include <tr1/functional> -#include <tr1/unordered_map> +#include <functional> +#include <unordered_map> #include <algorithm> #include <vector> using namespace paludis; using namespace paludis::paludis_environment; -typedef std::tr1::unordered_multimap<std::string, std::string, Hash<std::string> > Mirrors; +typedef std::unordered_multimap<std::string, std::string, Hash<std::string> > Mirrors; namespace paludis { @@ -69,7 +69,7 @@ MirrorsConf::add(const FSEntry & filename) { Context context("When adding source '" + stringify(filename) + "' as a mirrors file:"); - std::tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions())); + std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions())); if (! f) return; @@ -88,13 +88,13 @@ MirrorsConf::add(const FSEntry & filename) } } -std::tr1::shared_ptr<const MirrorsSequence> +std::shared_ptr<const MirrorsSequence> MirrorsConf::query(const std::string & m) const { - std::tr1::shared_ptr<MirrorsSequence> result(new MirrorsSequence); + std::shared_ptr<MirrorsSequence> result(new MirrorsSequence); std::pair<Mirrors::const_iterator, Mirrors::const_iterator> p(_imp->mirrors.equal_range(m)); std::transform(p.first, p.second, result->back_inserter(), - std::tr1::mem_fn(&std::pair<const std::string, std::string>::second)); + std::mem_fn(&std::pair<const std::string, std::string>::second)); return result; } diff --git a/paludis/environments/paludis/mirrors_conf.hh b/paludis/environments/paludis/mirrors_conf.hh index 408ae25ad..3c4098969 100644 --- a/paludis/environments/paludis/mirrors_conf.hh +++ b/paludis/environments/paludis/mirrors_conf.hh @@ -60,7 +60,7 @@ namespace paludis /** * Query a mirror. */ - std::tr1::shared_ptr<const MirrorsSequence> query(const std::string &) const + std::shared_ptr<const MirrorsSequence> query(const std::string &) const PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc index 9e37a53c7..f03e2adf0 100644 --- a/paludis/environments/paludis/output_conf.cc +++ b/paludis/environments/paludis/output_conf.cc @@ -73,17 +73,17 @@ namespace NamedValue<n::action_requirement, std::string> action_requirement; NamedValue<n::ignore_unfetched_requirement, Tribool> ignore_unfetched_requirement; NamedValue<n::manager, std::string> manager; - NamedValue<n::matches_requirement, std::tr1::shared_ptr<PackageDepSpec> > matches_requirement; + NamedValue<n::matches_requirement, std::shared_ptr<PackageDepSpec> > matches_requirement; NamedValue<n::name_requirement, std::string> name_requirement; NamedValue<n::output_exclusivity_requirement, OutputExclusivity> output_exclusivity_requirement; NamedValue<n::type_requirement, std::string> type_requirement; }; typedef std::list<Rule> RuleList; - typedef std::map<std::string, std::tr1::shared_ptr<Map<std::string, std::string> > > Managers; + typedef std::map<std::string, std::shared_ptr<Map<std::string, std::string> > > Managers; std::string from_keys( - const std::tr1::shared_ptr<const Map<std::string, std::string> > & m, + const std::shared_ptr<const Map<std::string, std::string> > & m, const std::string & k) { if (m->end() == m->find(k)) @@ -226,11 +226,11 @@ namespace struct CreateVarsFromInfo { const Environment * const env; - std::tr1::shared_ptr<Map<std::string, std::string> > m; + std::shared_ptr<Map<std::string, std::string> > m; CreateVarsFromInfo( const Environment * const e, - std::tr1::shared_ptr<Map<std::string, std::string> > & mm) : + std::shared_ptr<Map<std::string, std::string> > & mm) : env(e), m(mm) { @@ -244,7 +244,7 @@ namespace m->insert("time", stringify(time(0))); m->insert("pid", stringify(getpid())); - const std::tr1::shared_ptr<const PaludisDistribution> dist( + const std::shared_ptr<const PaludisDistribution> dist( PaludisExtraDistributionData::get_instance()->data_from_distribution( *DistributionData::get_instance()->distribution_from_string(env->distribution()))); @@ -277,12 +277,12 @@ namespace } }; - const std::tr1::shared_ptr<Map<std::string, std::string> > + const std::shared_ptr<Map<std::string, std::string> > vars_from_create_output_manager_info( const Environment * const env, const CreateOutputManagerInfo & i) { - std::tr1::shared_ptr<Map<std::string, std::string> > result(new Map<std::string, std::string>); + std::shared_ptr<Map<std::string, std::string> > result(new Map<std::string, std::string>); CreateVarsFromInfo v(env, result); i.accept(v); return result; @@ -290,9 +290,9 @@ namespace const std::string replace_percent_vars( const std::string & s, - const std::tr1::shared_ptr<const Map<std::string, std::string> > & vars, - const std::tr1::shared_ptr<const Map<std::string, std::string> > & override_vars, - const std::tr1::shared_ptr<const Map<std::string, std::string> > & file_vars) + const std::shared_ptr<const Map<std::string, std::string> > & vars, + const std::shared_ptr<const Map<std::string, std::string> > & override_vars, + const std::shared_ptr<const Map<std::string, std::string> > & file_vars) { std::string result, token; SimpleParser parser(s); @@ -329,7 +329,7 @@ OutputConf::add(const FSEntry & filename) { Context context("When adding source '" + stringify(filename) + "' as an output file:"); - std::tr1::shared_ptr<KeyValueConfigFile> f(make_bashable_kv_conf(filename, + std::shared_ptr<KeyValueConfigFile> f(make_bashable_kv_conf(filename, make_shared_ptr(new Map<std::string, std::string>), KeyValueConfigFileOptions() + kvcfo_allow_sections)); if (! f) @@ -399,7 +399,7 @@ OutputConf::add(const FSEntry & filename) _imp->managers[m->first] = m->second; } -const std::tr1::shared_ptr<OutputManager> +const std::shared_ptr<OutputManager> OutputConf::create_output_manager(const CreateOutputManagerInfo & i) const { Context context("When creating output manager:"); @@ -412,7 +412,7 @@ OutputConf::create_output_manager(const CreateOutputManagerInfo & i) const throw PaludisConfigError("No matching output manager rule specified"); } -const std::tr1::shared_ptr<OutputManager> +const std::shared_ptr<OutputManager> OutputConf::create_named_output_manager(const std::string & s, const CreateOutputManagerInfo & n) const { Context context("When creating output manager named '" + s + "':"); @@ -421,7 +421,7 @@ OutputConf::create_named_output_manager(const std::string & s, const CreateOutpu if (i == _imp->managers.end()) throw PaludisConfigError("No output manager named '" + s + "' exists"); - std::tr1::shared_ptr<Map<std::string, std::string> > vars(vars_from_create_output_manager_info( + std::shared_ptr<Map<std::string, std::string> > vars(vars_from_create_output_manager_info( _imp->env, n)); std::string handler; @@ -466,10 +466,10 @@ OutputConf::create_named_output_manager(const std::string & s, const CreateOutpu } else return OutputManagerFactory::get_instance()->create( - std::tr1::bind(&from_keys, i->second, std::tr1::placeholders::_1), - std::tr1::bind(&OutputConf::create_named_output_manager, this, - std::tr1::placeholders::_1, std::tr1::cref(n)), - std::tr1::bind(replace_percent_vars, std::tr1::placeholders::_1, vars, std::tr1::placeholders::_2, + std::bind(&from_keys, i->second, std::placeholders::_1), + std::bind(&OutputConf::create_named_output_manager, this, + std::placeholders::_1, std::cref(n)), + std::bind(replace_percent_vars, std::placeholders::_1, vars, std::placeholders::_2, i->second) ); } diff --git a/paludis/environments/paludis/output_conf.hh b/paludis/environments/paludis/output_conf.hh index 88675894e..976fd3d17 100644 --- a/paludis/environments/paludis/output_conf.hh +++ b/paludis/environments/paludis/output_conf.hh @@ -24,7 +24,7 @@ #include <paludis/util/fs_entry-fwd.hh> #include <paludis/output_manager-fwd.hh> #include <paludis/create_output_manager_info-fwd.hh> -#include <tr1/memory> +#include <memory> namespace paludis { @@ -52,10 +52,10 @@ namespace paludis */ void add(const FSEntry &); - const std::tr1::shared_ptr<OutputManager> create_output_manager( + const std::shared_ptr<OutputManager> create_output_manager( const CreateOutputManagerInfo &) const; - const std::tr1::shared_ptr<OutputManager> create_named_output_manager( + const std::shared_ptr<OutputManager> create_named_output_manager( const std::string & s, const CreateOutputManagerInfo & n) const; }; } diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc index 044216f6b..f13de6f53 100644 --- a/paludis/environments/paludis/package_mask_conf.cc +++ b/paludis/environments/paludis/package_mask_conf.cc @@ -39,12 +39,12 @@ #include <paludis/util/make_shared_ptr.hh> #include <list> #include <algorithm> -#include <tr1/functional> +#include <functional> using namespace paludis; using namespace paludis::paludis_environment; -typedef std::list<std::pair<SetName, std::tr1::shared_ptr<const SetSpecTree> > > Sets; +typedef std::list<std::pair<SetName, std::shared_ptr<const SetSpecTree> > > Sets; namespace paludis { @@ -52,7 +52,7 @@ namespace paludis struct Implementation<PackageMaskConf> { const PaludisEnvironment * const env; - std::list<std::tr1::shared_ptr<const PackageDepSpec> > masks; + std::list<std::shared_ptr<const PackageDepSpec> > masks; mutable Sets sets; mutable Mutex set_mutex; @@ -77,7 +77,7 @@ PackageMaskConf::add(const FSEntry & filename) { Context context("When adding source '" + stringify(filename) + "' as a package mask or unmask file:"); - std::tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions())); + std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions())); if (! f) return; @@ -86,7 +86,7 @@ PackageMaskConf::add(const FSEntry & filename) { try { - _imp->masks.push_back(std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(parse_user_package_dep_spec( + _imp->masks.push_back(std::shared_ptr<PackageDepSpec>(new PackageDepSpec(parse_user_package_dep_spec( *line, _imp->env, UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation + updso_throw_if_set)))); } @@ -100,11 +100,11 @@ PackageMaskConf::add(const FSEntry & filename) bool PackageMaskConf::query(const PackageID & e) const { - using namespace std::tr1::placeholders; + using namespace std::placeholders; if (indirect_iterator(_imp->masks.end()) != std::find_if( indirect_iterator(_imp->masks.begin()), indirect_iterator(_imp->masks.end()), - std::tr1::bind(&match_package, std::tr1::ref(*_imp->env), _1, std::tr1::cref(e), MatchPackageOptions()))) + std::bind(&match_package, std::ref(*_imp->env), _1, std::cref(e), MatchPackageOptions()))) return true; { diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc index 8b5746106..26eaf74de 100644 --- a/paludis/environments/paludis/paludis_config.cc +++ b/paludis/environments/paludis/paludis_config.cc @@ -53,8 +53,8 @@ #include <paludis/distribution.hh> #include <paludis/repository_factory.hh> -#include <tr1/functional> -#include <tr1/unordered_map> +#include <functional> +#include <unordered_map> #include <algorithm> #include <sstream> #include <list> @@ -76,11 +76,11 @@ using namespace paludis; using namespace paludis::paludis_environment; -typedef std::list<std::tr1::function<std::string (const std::string &)> > Repos; +typedef std::list<std::function<std::string (const std::string &)> > Repos; namespace { - std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m, + std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m, const std::string & k) { Map<std::string, std::string>::ConstIterator mm(m->find(k)); @@ -90,14 +90,14 @@ namespace return mm->second; } - std::string from_kv(const std::tr1::shared_ptr<const KeyValueConfigFile> & m, + std::string from_kv(const std::shared_ptr<const KeyValueConfigFile> & m, const std::string & k) { return m->get(k); } std::string predefined( - const std::tr1::shared_ptr<const Map<std::string, std::string> > & m, + const std::shared_ptr<const Map<std::string, std::string> > & m, const KeyValueConfigFile &, const std::string & k) { @@ -112,7 +112,7 @@ namespace } std::string to_kv_func( - const std::tr1::function<std::string (const std::string &)> & f, + const std::function<std::string (const std::string &)> & f, const KeyValueConfigFile &, const std::string & k) { @@ -122,7 +122,7 @@ namespace std::string override( const std::string & o, const std::string & v, - const std::tr1::function<std::string (const std::string &)> & f, + const std::function<std::string (const std::string &)> & f, const std::string & k) { if (k == o) @@ -132,7 +132,7 @@ namespace void parse_commandline_vars( const std::string & varstr, - const std::tr1::shared_ptr<Map<std::string, std::string> > & varmap) + const std::shared_ptr<Map<std::string, std::string> > & varmap) { typedef std::list<std::string> SetsType; SetsType sets; @@ -171,24 +171,24 @@ namespace paludis std::string config_dir; mutable Mutex distribution_mutex; mutable std::string distribution; - std::tr1::shared_ptr<FSEntrySequence> bashrc_files; + std::shared_ptr<FSEntrySequence> bashrc_files; Repos repos; - std::tr1::function<std::string (const std::string &)> predefined_conf_vars_func; + std::function<std::string (const std::string &)> predefined_conf_vars_func; std::string root_prefix; - std::tr1::shared_ptr<KeywordsConf> keywords_conf; - std::tr1::shared_ptr<UseConf> use_conf; - std::tr1::shared_ptr<LicensesConf> licenses_conf; - std::tr1::shared_ptr<PackageMaskConf> package_mask_conf; - std::tr1::shared_ptr<PackageMaskConf> package_unmask_conf; - std::tr1::shared_ptr<MirrorsConf> mirrors_conf; - std::tr1::shared_ptr<OutputConf> output_conf; - mutable std::tr1::shared_ptr<World> world; + std::shared_ptr<KeywordsConf> keywords_conf; + std::shared_ptr<UseConf> use_conf; + std::shared_ptr<LicensesConf> licenses_conf; + std::shared_ptr<PackageMaskConf> package_mask_conf; + std::shared_ptr<PackageMaskConf> package_unmask_conf; + std::shared_ptr<MirrorsConf> mirrors_conf; + std::shared_ptr<OutputConf> output_conf; + mutable std::shared_ptr<World> world; mutable Mutex reduced_mutex; - mutable std::tr1::shared_ptr<uid_t> reduced_uid; - mutable std::tr1::shared_ptr<gid_t> reduced_gid; + mutable std::shared_ptr<uid_t> reduced_uid; + mutable std::shared_ptr<gid_t> reduced_gid; mutable Mutex genera |