aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-24 09:49:50 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-24 09:49:50 +0100
commit60a7c102aaedb56844c8a054c62bcc9dfe91bde7 (patch)
tree5449641aecb3b6c449a73c0618371977d1ea86ac
parentdb798f9e36404906bcd1253c9410169de122fefb (diff)
downloadpaludis-60a7c102aaedb56844c8a054c62bcc9dfe91bde7.tar.gz
paludis-60a7c102aaedb56844c8a054c62bcc9dfe91bde7.tar.xz
Deboilerplateise
-rw-r--r--paludis/dep_tag.cc48
-rw-r--r--paludis/environments/no_config/registration.cc26
-rw-r--r--paludis/environments/paludis/registration.cc2
-rw-r--r--paludis/environments/portage/registration.cc2
-rw-r--r--paludis/python_hooks.cc2
-rw-r--r--paludis/range_rewriter.cc2
-rw-r--r--paludis/repositories/accounts/accounts_repository.cc24
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc10
-rw-r--r--paludis/repositories/cran/cran_repository.cc18
-rw-r--r--paludis/repositories/e/e_repository.cc66
-rw-r--r--paludis/repositories/e/exheres_layout.cc4
-rw-r--r--paludis/repositories/e/exndbam_repository.cc20
-rw-r--r--paludis/repositories/e/layout.cc2
-rw-r--r--paludis/repositories/e/profile.cc2
-rw-r--r--paludis/repositories/e/traditional_layout.cc4
-rw-r--r--paludis/repositories/e/vdb_repository.cc4
-rw-r--r--paludis/repositories/fake/fake_repository_base.cc4
-rw-r--r--paludis/repositories/repository/repository_repository.cc16
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.cc16
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.cc16
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc6
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc6
-rw-r--r--paludis/set_file.cc6
-rw-r--r--python/dep_spec.cc2
-rw-r--r--src/clients/inquisitio/matcher.cc2
-rw-r--r--src/output/console_install_task.cc4
26 files changed, 157 insertions, 157 deletions
diff --git a/paludis/dep_tag.cc b/paludis/dep_tag.cc
index 792e2b6..7c68bae 100644
--- a/paludis/dep_tag.cc
+++ b/paludis/dep_tag.cc
@@ -46,45 +46,45 @@ namespace
std::shared_ptr<DepTagCategory>
make_glsa_dep_tag()
{
- return std::shared_ptr<DepTagCategory>(std::make_shared<DepTagCategory>(
- true,
- "glsa",
- "Security advisories",
- "Your system is potentially affected by these security issues:",
- "Please read the advisories carefully and take appropriate action."));
+ return std::make_shared<DepTagCategory>(
+ true,
+ "glsa",
+ "Security advisories",
+ "Your system is potentially affected by these security issues:",
+ "Please read the advisories carefully and take appropriate action.");
}
std::shared_ptr<DepTagCategory>
make_general_set_dep_tag()
{
- return std::shared_ptr<DepTagCategory>(std::make_shared<DepTagCategory>(
- true,
- "general",
- "General sets",
- "",
- ""));
+ return std::make_shared<DepTagCategory>(
+ true,
+ "general",
+ "General sets",
+ "",
+ "");
}
std::shared_ptr<DepTagCategory>
make_dependency_set_dep_tag()
{
- return std::shared_ptr<DepTagCategory>(std::make_shared<DepTagCategory>(
- false,
- "dependency",
- "Dependencies",
- "",
- ""));
+ return std::make_shared<DepTagCategory>(
+ false,
+ "dependency",
+ "Dependencies",
+ "",
+ "");
}
std::shared_ptr<DepTagCategory>
make_target_dep_tag()
{
- return std::shared_ptr<DepTagCategory>(std::make_shared<DepTagCategory>(
- false,
- "target",
- "Targets",
- "",
- ""));
+ return std::make_shared<DepTagCategory>(
+ false,
+ "target",
+ "Targets",
+ "",
+ "");
}
}
diff --git a/paludis/environments/no_config/registration.cc b/paludis/environments/no_config/registration.cc
index f7353e8..d23873f 100644
--- a/paludis/environments/no_config/registration.cc
+++ b/paludis/environments/no_config/registration.cc
@@ -87,19 +87,19 @@ namespace
}
}
- return std::shared_ptr<Environment>(std::make_shared<NoConfigEnvironment>(
- make_named_values<no_config_environment::Params>(
- n::accept_unstable() = accept_unstable,
- n::disable_metadata_cache() = disable_metadata_cache,
- n::extra_accept_keywords() = extra_accept_keywords,
- n::extra_params() = extra_params,
- n::extra_repository_dirs() = extra_repository_dirs,
- n::master_repository_name() = master_repository_name,
- n::profiles_if_not_auto() = profile,
- n::repository_dir() = repository_dir,
- n::repository_type() = repository_type,
- n::write_cache() = write_cache
- )));
+ return std::make_shared<NoConfigEnvironment>(
+ make_named_values<no_config_environment::Params>(
+ n::accept_unstable() = accept_unstable,
+ n::disable_metadata_cache() = disable_metadata_cache,
+ n::extra_accept_keywords() = extra_accept_keywords,
+ n::extra_params() = extra_params,
+ n::extra_repository_dirs() = extra_repository_dirs,
+ n::master_repository_name() = master_repository_name,
+ n::profiles_if_not_auto() = profile,
+ n::repository_dir() = repository_dir,
+ n::repository_type() = repository_type,
+ n::write_cache() = write_cache
+ ));
}
}
diff --git a/paludis/environments/paludis/registration.cc b/paludis/environments/paludis/registration.cc
index 70f045e..d24fb8b 100644
--- a/paludis/environments/paludis/registration.cc
+++ b/paludis/environments/paludis/registration.cc
@@ -29,7 +29,7 @@ namespace
std::shared_ptr<Environment>
make_paludis_environment(const std::string & s)
{
- return std::shared_ptr<Environment>(std::make_shared<PaludisEnvironment>(s));
+ return std::make_shared<PaludisEnvironment>(s);
}
}
diff --git a/paludis/environments/portage/registration.cc b/paludis/environments/portage/registration.cc
index bb606f1..330bfeb 100644
--- a/paludis/environments/portage/registration.cc
+++ b/paludis/environments/portage/registration.cc
@@ -29,7 +29,7 @@ namespace
std::shared_ptr<Environment>
make_portage_environment(const std::string & s)
{
- return std::shared_ptr<Environment>(std::make_shared<PortageEnvironment>(s));
+ return std::make_shared<PortageEnvironment>(s);
}
}
diff --git a/paludis/python_hooks.cc b/paludis/python_hooks.cc
index 328671b..7daebaa 100644
--- a/paludis/python_hooks.cc
+++ b/paludis/python_hooks.cc
@@ -440,5 +440,5 @@ PyHookFile::_get_traceback() const
std::shared_ptr<HookFile>
create_py_hook_file(const FSEntry & f, const bool b, const Environment * const e)
{
- return std::shared_ptr<HookFile>(std::make_shared<PyHookFile>(f, b, e));
+ return std::make_shared<PyHookFile>(f, b, e);
}
diff --git a/paludis/range_rewriter.cc b/paludis/range_rewriter.cc
index 8266ffc..e2d908e 100644
--- a/paludis/range_rewriter.cc
+++ b/paludis/range_rewriter.cc
@@ -308,6 +308,6 @@ RangeRewriter::spec() const
if (_imp->invalid || ! _imp->spec_data)
return std::shared_ptr<PackageDepSpec>();
- return std::shared_ptr<PackageDepSpec>(std::make_shared<PackageDepSpec>(_imp->spec_data));
+ return std::make_shared<PackageDepSpec>(_imp->spec_data);
}
diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index c475be4..ca4b2a7 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -171,11 +171,11 @@ AccountsRepository::repository_factory_create(
if (name_str.empty())
name_str = "accounts";
- return std::shared_ptr<AccountsRepository>(std::make_shared<AccountsRepository>(
- make_named_values<AccountsRepositoryParams>(
- n::environment() = env,
- n::name() = RepositoryName(name_str)
- )));
+ return std::make_shared<AccountsRepository>(
+ make_named_values<AccountsRepositoryParams>(
+ n::environment() = env,
+ n::name() = RepositoryName(name_str)
+ ));
}
std::shared_ptr<Repository>
@@ -200,13 +200,13 @@ AccountsRepository::repository_factory_installed_create(
if (root_str != "/")
throw AccountsRepositoryConfigurationError("Values other than '/' for 'root' not yet supported");
- return std::shared_ptr<AccountsRepository>(std::make_shared<AccountsRepository>(
- make_named_values<InstalledAccountsRepositoryParams>(
- n::environment() = env,
- n::handler() = handler,
- n::name() = RepositoryName(name_str),
- n::root() = FSEntry(root_str)
- )));
+ return std::make_shared<AccountsRepository>(
+ make_named_values<InstalledAccountsRepositoryParams>(
+ n::environment() = env,
+ n::handler() = handler,
+ n::name() = RepositoryName(name_str),
+ n::root() = FSEntry(root_str)
+ ));
}
RepositoryName
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index e772294..db8f5b4 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -393,11 +393,11 @@ CRANInstalledRepository::repository_factory_create(
if (! f("world").empty())
throw CRANInstalledRepositoryConfigurationError("Key 'world' is no longer supported.");
- return std::shared_ptr<Repository>(std::make_shared<CRANInstalledRepository>(make_named_values<CRANInstalledRepositoryParams>(
- n::environment() = env,
- n::location() = location,
- n::root() = root
- )));
+ return std::make_shared<CRANInstalledRepository>(make_named_values<CRANInstalledRepositoryParams>(
+ n::environment() = env,
+ n::location() = location,
+ n::root() = root
+ ));
}
RepositoryName
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 125b0b8..1956646 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -420,15 +420,15 @@ CRANRepository::repository_factory_create(
if (builddir.empty())
builddir = "/var/tmp/paludis";
- return std::shared_ptr<Repository>(std::make_shared<CRANRepository>(make_named_values<CRANRepositoryParams>(
- n::builddir() = builddir,
- n::distdir() = distdir,
- n::environment() = env,
- n::library() = library,
- n::location() = location,
- n::mirror() = mirror,
- n::sync() = sync
- )));
+ return std::make_shared<CRANRepository>(make_named_values<CRANRepositoryParams>(
+ n::builddir() = builddir,
+ n::distdir() = distdir,
+ n::environment() = env,
+ n::library() = library,
+ n::location() = location,
+ n::mirror() = mirror,
+ n::sync() = sync
+ ));
}
RepositoryName
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index a374896..04b4912 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -1501,39 +1501,39 @@ ERepository::repository_factory_create(
throw ERepositoryConfigurationError("binary_destination = true, but binary_keywords is unset or empty");
}
- return std::shared_ptr<ERepository>(std::make_shared<ERepository>(make_named_values<ERepositoryParams>(
- n::append_repository_name_to_write_cache() = append_repository_name_to_write_cache,
- n::auto_profiles() = auto_profiles,
- n::binary_destination() = binary_destination,
- n::binary_distdir() = binary_distdir,
- n::binary_keywords() = binary_keywords,
- n::binary_uri_prefix() = binary_uri_prefix,
- n::builddir() = FSEntry(builddir).realpath_if_exists(),
- n::cache() = cache,
- n::distdir() = FSEntry(distdir).realpath_if_exists(),
- n::eapi_when_unknown() = eapi_when_unknown,
- n::eapi_when_unspecified() = eapi_when_unspecified,
- n::eclassdirs() = eclassdirs,
- n::entry_format() = "e",
- n::environment() = env,
- n::ignore_deprecated_profiles() = ignore_deprecated_profiles,
- n::layout() = layout,
- n::location() = FSEntry(location).realpath_if_exists(),
- n::master_repositories() = master_repositories,
- n::names_cache() = FSEntry(names_cache).realpath_if_exists(),
- n::newsdir() = FSEntry(newsdir).realpath_if_exists(),
- n::profile_eapi_when_unspecified() = profile_eapi,
- n::profile_layout() = profile_layout,
- n::profiles() = profiles,
- n::profiles_explicitly_set() = profiles_explicitly_set,
- n::securitydir() = FSEntry(securitydir).realpath_if_exists(),
- n::setsdir() = FSEntry(setsdir).realpath_if_exists(),
- n::sync() = sync,
- n::sync_options() = sync_options,
- n::use_manifest() = use_manifest,
- n::write_bin_uri_prefix() = "",
- n::write_cache() = FSEntry(write_cache).realpath_if_exists()
- )));
+ return std::make_shared<ERepository>(make_named_values<ERepositoryParams>(
+ n::append_repository_name_to_write_cache() = append_repository_name_to_write_cache,
+ n::auto_profiles() = auto_profiles,
+ n::binary_destination() = binary_destination,
+ n::binary_distdir() = binary_distdir,
+ n::binary_keywords() = binary_keywords,
+ n::binary_uri_prefix() = binary_uri_prefix,
+ n::builddir() = FSEntry(builddir).realpath_if_exists(),
+ n::cache() = cache,
+ n::distdir() = FSEntry(distdir).realpath_if_exists(),
+ n::eapi_when_unknown() = eapi_when_unknown,
+ n::eapi_when_unspecified() = eapi_when_unspecified,
+ n::eclassdirs() = eclassdirs,
+ n::entry_format() = "e",
+ n::environment() = env,
+ n::ignore_deprecated_profiles() = ignore_deprecated_profiles,
+ n::layout() = layout,
+ n::location() = FSEntry(location).realpath_if_exists(),
+ n::master_repositories() = master_repositories,
+ n::names_cache() = FSEntry(names_cache).realpath_if_exists(),
+ n::newsdir() = FSEntry(newsdir).realpath_if_exists(),
+ n::profile_eapi_when_unspecified() = profile_eapi,
+ n::profile_layout() = profile_layout,
+ n::profiles() = profiles,
+ n::profiles_explicitly_set() = profiles_explicitly_set,
+ n::securitydir() = FSEntry(securitydir).realpath_if_exists(),
+ n::setsdir() = FSEntry(setsdir).realpath_if_exists(),
+ n::sync() = sync,
+ n::sync_options() = sync_options,
+ n::use_manifest() = use_manifest,
+ n::write_bin_uri_prefix() = "",
+ n::write_cache() = FSEntry(write_cache).realpath_if_exists()
+ ));
}
std::shared_ptr<const RepositoryNameSet>
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index c323f28..c2445fe 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -359,7 +359,7 @@ ExheresLayout::package_names(const CategoryNamePart & c) const
need_category_names();
if (_imp->category_names.end() == _imp->category_names.find(c))
- return std::shared_ptr<QualifiedPackageNameSet>(std::make_shared<QualifiedPackageNameSet>());
+ return std::make_shared<QualifiedPackageNameSet>();
if ((_imp->tree_root / "packages" / stringify(c)).is_directory_or_symlink_to_directory())
for (DirIterator d(_imp->tree_root / "packages" / stringify(c)), d_end ; d != d_end ; ++d)
@@ -407,7 +407,7 @@ ExheresLayout::package_ids(const QualifiedPackageName & n) const
return _imp->ids.find(n)->second;
}
else
- return std::shared_ptr<PackageIDSequence>(std::make_shared<PackageIDSequence>());
+ return std::make_shared<PackageIDSequence>();
}
const std::shared_ptr<const FSEntrySequence>
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index 68aaa9c..a93af04 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -160,16 +160,16 @@ ExndbamRepository::repository_factory_create(
*DistributionData::get_instance()->distribution_from_string(
env->distribution()))->default_eapi_when_unknown();
- return std::shared_ptr<Repository>(std::make_shared<ExndbamRepository>(
- RepositoryName(name),
- make_named_values<ExndbamRepositoryParams>(
- n::builddir() = builddir,
- n::eapi_when_unknown() = eapi_when_unknown,
- n::environment() = env,
- n::location() = location,
- n::root() = root
- )
- ));
+ return std::make_shared<ExndbamRepository>(
+ RepositoryName(name),
+ make_named_values<ExndbamRepositoryParams>(
+ n::builddir() = builddir,
+ n::eapi_when_unknown() = eapi_when_unknown,
+ n::environment() = env,
+ n::location() = location,
+ n::root() = root
+ )
+ );
}
RepositoryName
diff --git a/paludis/repositories/e/layout.cc b/paludis/repositories/e/layout.cc
index 3de52c5..539f540 100644
--- a/paludis/repositories/e/layout.cc
+++ b/paludis/repositories/e/layout.cc
@@ -59,7 +59,7 @@ namespace
make_layout(const ERepository * const n, const FSEntry & b,
std::shared_ptr<const FSEntrySequence> f)
{
- return std::shared_ptr<Layout>(std::make_shared<T_>(n, b, f));
+ return std::make_shared<T_>(n, b, f);
}
}
diff --git a/paludis/repositories/e/profile.cc b/paludis/repositories/e/profile.cc
index b46fbd8..48562d9 100644
--- a/paludis/repositories/e/profile.cc
+++ b/paludis/repositories/e/profile.cc
@@ -45,7 +45,7 @@ namespace
const std::string & a,
const bool x)
{
- return std::shared_ptr<Profile>(std::make_shared<T_>(env, repo, name, locations, a, x));
+ return std::make_shared<T_>(env, repo, name, locations, a, x);
}
}
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index b2d9ce5..2f9c070 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -370,7 +370,7 @@ TraditionalLayout::package_names(const CategoryNamePart & c) const
need_category_names();
if (_imp->category_names.end() == _imp->category_names.find(c))
- return std::shared_ptr<QualifiedPackageNameSet>(std::make_shared<QualifiedPackageNameSet>());
+ return std::make_shared<QualifiedPackageNameSet>();
if ((_imp->tree_root / stringify(c)).is_directory_or_symlink_to_directory())
for (DirIterator d(_imp->tree_root / stringify(c), DirIteratorOptions() + dio_inode_sort), d_end ; d != d_end ; ++d)
@@ -418,7 +418,7 @@ TraditionalLayout::package_ids(const QualifiedPackageName & n) const
return _imp->ids.find(n)->second;
}
else
- return std::shared_ptr<PackageIDSequence>(std::make_shared<PackageIDSequence>());
+ return std::make_shared<PackageIDSequence>();
}
const std::shared_ptr<const FSEntrySequence>
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 8baf491..85580e7 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -350,7 +350,7 @@ VDBRepository::repository_factory_create(
*DistributionData::get_instance()->distribution_from_string(
env->distribution()))->default_eapi_when_unknown();
- return std::shared_ptr<Repository>(std::make_shared<VDBRepository>(make_named_values<VDBRepositoryParams>(
+ return std::make_shared<VDBRepository>(make_named_values<VDBRepositoryParams>(
n::builddir() = builddir,
n::eapi_when_unknown() = eapi_when_unknown,
n::environment() = env,
@@ -359,7 +359,7 @@ VDBRepository::repository_factory_create(
n::names_cache() = names_cache,
n::provides_cache() = provides_cache,
n::root() = root
- )));
+ ));
}
RepositoryName
diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc
index 06554be..513b2a9 100644
--- a/paludis/repositories/fake/fake_repository_base.cc
+++ b/paludis/repositories/fake/fake_repository_base.cc
@@ -111,9 +111,9 @@ std::shared_ptr<const PackageIDSequence>
FakeRepositoryBase::package_ids(const QualifiedPackageName & n) const
{
if (! has_category_named(n.category()))
- return std::shared_ptr<PackageIDSequence>(std::make_shared<PackageIDSequence>());
+ return std::make_shared<PackageIDSequence>();
if (! has_package_named(n))
- return std::shared_ptr<PackageIDSequence>(std::make_shared<PackageIDSequence>());
+ return std::make_shared<PackageIDSequence>();
return _imp->ids.find(n)->second;
}
diff --git a/paludis/repositories/repository/repository_repository.cc b/paludis/repositories/repository/repository_repository.cc
index 64b6d56..389084b 100644
--- a/paludis/repositories/repository/repository_repository.cc
+++ b/paludis/repositories/repository/repository_repository.cc
@@ -291,14 +291,14 @@ RepositoryRepository::repository_factory_create(
if (root_str.empty())
root_str = "/";
- return std::shared_ptr<RepositoryRepository>(std::make_shared<RepositoryRepository>(
- make_named_values<RepositoryRepositoryParams>(
- n::config_filename() = config_filename,
- n::config_template() = config_template,
- n::environment() = env,
- n::name() = RepositoryName(name_str),
- n::root() = root_str
- )));
+ return std::make_shared<RepositoryRepository>(
+ make_named_values<RepositoryRepositoryParams>(
+ n::config_filename() = config_filename,
+ n::config_template() = config_template,
+ n::environment() = env,
+ n::name() = RepositoryName(name_str),
+ n::root() = root_str
+ ));
}
RepositoryName
diff --git a/paludis/repositories/unavailable/unavailable_repository.cc b/paludis/repositories/unavailable/unavailable_repository.cc
index 61fe9d3..cd3d3b4 100644
--- a/paludis/repositories/unavailable/unavailable_repository.cc
+++ b/paludis/repositories/unavailable/unavailable_repository.cc
@@ -323,14 +323,14 @@ UnavailableRepository::repository_factory_create(
std::string sync_options(f("sync_options"));
- return std::shared_ptr<UnavailableRepository>(std::make_shared<UnavailableRepository>(
- make_named_values<UnavailableRepositoryParams>(
- n::environment() = env,
- n::location() = location,
- n::name() = RepositoryName(name_str),
- n::sync() = sync,
- n::sync_options() = sync_options
- )));
+ return std::make_shared<UnavailableRepository>(
+ make_named_values<UnavailableRepositoryParams>(
+ n::environment() = env,
+ n::location() = location,
+ n::name() = RepositoryName(name_str),
+ n::sync() = sync,
+ n::sync_options() = sync_options
+ ));
}
RepositoryName
diff --git a/paludis/repositories/unwritten/unwritten_repository.cc b/paludis/repositories/unwritten/unwritten_repository.cc
index f715a61..c7bfef0 100644
--- a/paludis/repositories/unwritten/unwritten_repository.cc
+++ b/paludis/repositories/unwritten/unwritten_repository.cc
@@ -323,14 +323,14 @@ UnwrittenRepository::repository_factory_create(
std::string sync_options(f("sync_options"));
- return std::shared_ptr<UnwrittenRepository>(std::make_shared<UnwrittenRepository>(
- make_named_values<UnwrittenRepositoryParams>(
- n::environment() = env,
- n::location() = location,
- n::name() = RepositoryName(name_str),
- n::sync() = sync,
- n::sync_options() = sync_options
- )));
+ return std::make_shared<UnwrittenRepository>(
+ make_named_values<UnwrittenRepositoryParams>(
+ n::environment() = env,
+ n::location() = location,
+ n::name() = RepositoryName(name_str),
+ n::sync() = sync,
+ n::sync_options() = sync_options
+ ));
}
RepositoryName
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index d49a36c..59452c0 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -168,13 +168,13 @@ std::shared_ptr<const PackageIDSequence>
InstalledVirtualsRepository::package_ids(const QualifiedPackageName & q) const
{
if (q.category().value() != "virtual")
- return std::shared_ptr<PackageIDSequence>(std::make_shared<PackageIDSequence>());
+ return std::make_shared<PackageIDSequence>();
need_ids();
IDMap::const_iterator i(_imp->ids.find(q));
if (i == _imp->ids.end())
- return std::shared_ptr<PackageIDSequence>(std::make_shared<PackageIDSequence>());
+ return std::make_shared<PackageIDSequence>();
return i->second;
}
@@ -183,7 +183,7 @@ std::shared_ptr<const QualifiedPackageNameSet>
InstalledVirtualsRepository::package_names(const CategoryNamePart & c) const
{
if (c.value() != "virtual")
- return std::shared_ptr<QualifiedPackageNameSet>(std::make_shared<QualifiedPackageNameSet>());
+ return std::make_shared<QualifiedPackageNameSet>();
need_ids();
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index f55b003..60401d9 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -251,13 +251,13 @@ std::shared_ptr<const PackageIDSequence>
VirtualsRepository::package_ids(const QualifiedPackageName & q) const
{
if (q.category().value() != "virtual")
- return std::shared_ptr<PackageIDSequence>(std::make_shared<PackageIDSequence>());
+ return std::make_shared<PackageIDSequence>();
need_ids();
IDMap::const_iterator i(_imp->ids.find(q));
if (i == _imp->ids.end())
- return std::shared_ptr<PackageIDSequence>(std::make_shared<PackageIDSequence>());
+ return std::make_shared<PackageIDSequence>();
return i->second;
}
@@ -266,7 +266,7 @@ std::shared_ptr<const QualifiedPackageNameSet>
VirtualsRepository::package_names(const CategoryNamePart & c) const
{
if (c.value() != "virtual")
- return std::shared_ptr<QualifiedPackageNameSet>(std::make_shared<QualifiedPackageNameSet>());
+ return std::make_shared<QualifiedPackageNameSet>();
need_ids();
diff --git a/paludis/set_file.cc b/paludis/set_file.cc
index 30a6aa3..67da205 100644
--- a/paludis/set_file.cc
+++ b/paludis/set_file.cc
@@ -129,13 +129,13 @@ namespace
switch (p.type())
{
case sft_simple:
- return std::shared_ptr<SetFileHandler>(std::make_shared<SimpleHandler>(p));
+ return std::make_shared<SimpleHandler>(p);
case sft_paludis_conf:
- return std::shared_ptr<SetFileHandler>(std::make_shared<PaludisConfHandler>(p));
+ return std::make_shared<PaludisConfHandler>(p);
case sft_paludis_bash:
- return std::shared_ptr<SetFileHandler>(std::make_shared<PaludisBashHandler>(p));
+ return std::make_shared<PaludisBashHandler>(p);
case last_sft:
break;
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index c7a3493..7b712bf 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -207,7 +207,7 @@ std::shared_ptr<T_>
deep_copy(const std::shared_ptr<const T_> & x)
{
if (x)
- return std::shared_ptr<T_>(std::make_shared<T_>(*x));
+ return std::make_shared<T_>(*x);
else
return std::shared_ptr<T_>();
}
diff --git a/src/clients/inquisitio/matcher.cc b/src/clients/inquisitio/matcher.cc
index a85869c..96368ee 100644
--- a/src/clients/inquisitio/matcher.cc
+++ b/src/clients/inquisitio/matcher.cc
@@ -48,7 +48,7 @@ namespace
static std::shared_ptr<Matcher>
make(const std::string & s)
{
- return std::shared_ptr<Matcher>(std::make_shared<M_>(s));
+ return std::make_shared<M_>(s);
}
}
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index 55c5e97..161b650 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -1516,13 +1516,13 @@ ConsoleInstallTask::display_merge_list_entry_end(const DepListEntry &, const Dis
std::shared_ptr<DepTagSummaryDisplayer>
ConsoleInstallTask::make_dep_tag_summary_displayer()
{
- return std::shared_ptr<DepTagSummaryDisplayer>(std::make_shared<DepTagSummaryDisplayer>(this));
+ return std::make_shared<DepTagSummaryDisplayer>(this);
}
std::shared_ptr<EntryDepTagDisplayer>
ConsoleInstallTask::make_entry_dep_tag_displayer()
{
- return std::shared_ptr<EntryDepTagDisplayer>(new EntryDepTagDisplayer());
+ return std::make_shared<EntryDepTagDisplayer>();
}
EntryDepTagDisplayer::EntryDepTagDisplayer()