aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/output_conf.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 12:52:10 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 18:55:26 +0100
commitf7be9952e67a5cdad6f3531a22654db198e7d106 (patch)
tree54c8fae2eaaf89851c038d28ed6deb9096c87b4d /paludis/environments/paludis/output_conf.cc
parent84f32a46c9bd03039af31be9626206ce891fa841 (diff)
downloadpaludis-f7be9952e67a5cdad6f3531a22654db198e7d106.tar.gz
paludis-f7be9952e67a5cdad6f3531a22654db198e7d106.tar.xz
Use std::make_shared<>
Diffstat (limited to 'paludis/environments/paludis/output_conf.cc')
-rw-r--r--paludis/environments/paludis/output_conf.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc
index f03e2ad..11807fe 100644
--- a/paludis/environments/paludis/output_conf.cc
+++ b/paludis/environments/paludis/output_conf.cc
@@ -36,6 +36,7 @@
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/map.hh>
#include <paludis/util/simple_parser.hh>
+#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/create_output_manager_info.hh>
#include <paludis/package_id.hh>
@@ -330,7 +331,7 @@ OutputConf::add(const FSEntry & filename)
Context context("When adding source '" + stringify(filename) + "' as an output file:");
std::shared_ptr<KeyValueConfigFile> f(make_bashable_kv_conf(filename,
- make_shared_ptr(new Map<std::string, std::string>),
+ std::make_shared<Map<std::string, std::string>>(),
KeyValueConfigFileOptions() + kvcfo_allow_sections));
if (! f)
return;
@@ -361,14 +362,14 @@ OutputConf::add(const FSEntry & filename)
{
local_rules.insert(
std::make_pair(section_name,
- make_shared_ptr(new Map<std::string, std::string>))).first->second->insert(
+ std::make_shared<Map<std::string, std::string>>())).first->second->insert(
remainder, k->second);
}
else if (section_kind == "manager")
{
local_managers.insert(
std::make_pair(section_name,
- make_shared_ptr(new Map<std::string, std::string>))).first->second->insert(
+ std::make_shared<Map<std::string, std::string>>())).first->second->insert(
remainder, k->second);
}
else