aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/accounts/accounts_repository.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-23 21:14:33 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-23 21:15:08 +0100
commit1e88d3f531a7d9cac4cd08db1484a3a87679af3c (patch)
tree9c2852177fbfc30366d24947658bf52a5c9e6d0c /paludis/repositories/accounts/accounts_repository.cc
parentc3802f0aec7d89a518cf74145aa73bf2ea688e35 (diff)
downloadpaludis-1e88d3f531a7d9cac4cd08db1484a3a87679af3c.tar.gz
paludis-1e88d3f531a7d9cac4cd08db1484a3a87679af3c.tar.xz
Avoid more explicit newage
Diffstat (limited to 'paludis/repositories/accounts/accounts_repository.cc')
-rw-r--r--paludis/repositories/accounts/accounts_repository.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index a0367bb43..c475be425 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -85,19 +85,19 @@ namespace paludis
const ActiveObjectPtr<DeferredConstructionPtr<std::shared_ptr<AccountsRepositoryStore> > > store;
Imp(AccountsRepository * const repo, const AccountsRepositoryParams & p) :
- params_if_not_installed(new AccountsRepositoryParams(p)),
- format_key(new LiteralMetadataValueKey<std::string> ("format", "format", mkt_significant, "accounts")),
+ params_if_not_installed(std::make_shared<AccountsRepositoryParams>(p)),
+ format_key(std::make_shared<LiteralMetadataValueKey<std::string> >("format", "format", mkt_significant, "accounts")),
store(DeferredConstructionPtr<std::shared_ptr<AccountsRepositoryStore> > (
std::bind(&make_store, repo, std::cref(*params_if_not_installed))))
{
}
Imp(AccountsRepository * const repo, const InstalledAccountsRepositoryParams & p) :
- params_if_installed(new InstalledAccountsRepositoryParams(p)),
+ params_if_installed(std::make_shared<InstalledAccountsRepositoryParams>(p)),
handler_if_installed(make_handler(p.handler())),
- format_key(new LiteralMetadataValueKey<std::string> ("format", "format", mkt_significant, "installed-accounts")),
- handler_key(new LiteralMetadataValueKey<std::string> ("handler", "handler", mkt_normal, p.handler())),
- installed_root_key(new LiteralMetadataValueKey<FSEntry>("root", "root", mkt_normal, p.root())),
+ format_key(std::make_shared<LiteralMetadataValueKey<std::string> >("format", "format", mkt_significant, "installed-accounts")),
+ handler_key(std::make_shared<LiteralMetadataValueKey<std::string> >("handler", "handler", mkt_normal, p.handler())),
+ installed_root_key(std::make_shared<LiteralMetadataValueKey<FSEntry>>("root", "root", mkt_normal, p.root())),
store(DeferredConstructionPtr<std::shared_ptr<AccountsRepositoryStore> > (
std::bind(&make_installed_store, repo, std::cref(*params_if_installed))))
{
@@ -171,7 +171,7 @@ AccountsRepository::repository_factory_create(
if (name_str.empty())
name_str = "accounts";
- return std::shared_ptr<AccountsRepository>(new AccountsRepository(
+ return std::shared_ptr<AccountsRepository>(std::make_shared<AccountsRepository>(
make_named_values<AccountsRepositoryParams>(
n::environment() = env,
n::name() = RepositoryName(name_str)
@@ -200,7 +200,7 @@ AccountsRepository::repository_factory_installed_create(
if (root_str != "/")
throw AccountsRepositoryConfigurationError("Values other than '/' for 'root' not yet supported");
- return std::shared_ptr<AccountsRepository>(new AccountsRepository(
+ return std::shared_ptr<AccountsRepository>(std::make_shared<AccountsRepository>(
make_named_values<InstalledAccountsRepositoryParams>(
n::environment() = env,
n::handler() = handler,