aboutsummaryrefslogtreecommitdiff
path: root/doc/api/cplusplus
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 10:11:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 18:54:57 +0100
commit7a8a792ae878e2b432e0c67a813022117faa4e60 (patch)
treed9eac8e45ccc206bc6920d14e25f5613b54be02f /doc/api/cplusplus
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'doc/api/cplusplus')
-rw-r--r--doc/api/cplusplus/examples/example_action.cc10
-rw-r--r--doc/api/cplusplus/examples/example_contents.cc6
-rw-r--r--doc/api/cplusplus/examples/example_dep_label.cc4
-rw-r--r--doc/api/cplusplus/examples/example_dep_spec.cc4
-rw-r--r--doc/api/cplusplus/examples/example_dep_spec_flattener.cc6
-rw-r--r--doc/api/cplusplus/examples/example_dep_tag.cc8
-rw-r--r--doc/api/cplusplus/examples/example_environment.cc4
-rw-r--r--doc/api/cplusplus/examples/example_formatter.cc4
-rw-r--r--doc/api/cplusplus/examples/example_mask.cc4
-rw-r--r--doc/api/cplusplus/examples/example_match_package.cc6
-rw-r--r--doc/api/cplusplus/examples/example_metadata_key.cc26
-rw-r--r--doc/api/cplusplus/examples/example_package_database.cc4
-rw-r--r--doc/api/cplusplus/examples/example_package_id.cc6
-rw-r--r--doc/api/cplusplus/examples/example_repository.cc6
-rw-r--r--doc/api/cplusplus/examples/example_selection.cc6
-rw-r--r--doc/api/cplusplus/examples/example_stringify_formatter.cc4
16 files changed, 54 insertions, 54 deletions
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>())]);