aboutsummaryrefslogtreecommitdiff
path: root/paludis/resolver/job_state.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/resolver/job_state.cc
parent84f32a46c9bd03039af31be9626206ce891fa841 (diff)
downloadpaludis-f7be9952e67a5cdad6f3531a22654db198e7d106.tar.gz
paludis-f7be9952e67a5cdad6f3531a22654db198e7d106.tar.xz
Use std::make_shared<>
Diffstat (limited to 'paludis/resolver/job_state.cc')
-rw-r--r--paludis/resolver/job_state.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/paludis/resolver/job_state.cc b/paludis/resolver/job_state.cc
index 0d44f50b5..ab49d293c 100644
--- a/paludis/resolver/job_state.cc
+++ b/paludis/resolver/job_state.cc
@@ -19,7 +19,7 @@
#include <paludis/resolver/job_state.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
-#include <paludis/util/make_shared_ptr.hh>
+#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/serialise-impl.hh>
using namespace paludis;
@@ -81,7 +81,7 @@ const std::shared_ptr<JobPendingState>
JobPendingState::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobPendingState");
- return make_shared_ptr(new JobPendingState);
+ return std::make_shared<JobPendingState>();
}
void
@@ -95,7 +95,7 @@ const std::shared_ptr<JobSkippedState>
JobSkippedState::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobSkippedState");
- return make_shared_ptr(new JobSkippedState);
+ return std::make_shared<JobSkippedState>();
}
void
@@ -129,20 +129,20 @@ JobActiveState::output_manager() const
const std::shared_ptr<JobSucceededState>
JobActiveState::succeeded() const
{
- return make_shared_ptr(new JobSucceededState(_imp->output_manager));
+ return std::make_shared<JobSucceededState>(_imp->output_manager);
}
const std::shared_ptr<JobFailedState>
JobActiveState::failed() const
{
- return make_shared_ptr(new JobFailedState(_imp->output_manager));
+ return std::make_shared<JobFailedState>(_imp->output_manager);
}
const std::shared_ptr<JobActiveState>
JobActiveState::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobActiveState");
- return make_shared_ptr(new JobActiveState());
+ return std::make_shared<JobActiveState>();
}
void
@@ -171,7 +171,7 @@ const std::shared_ptr<JobSucceededState>
JobSucceededState::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobSucceededState");
- return make_shared_ptr(new JobSucceededState(make_null_shared_ptr()));
+ return std::make_shared<JobSucceededState>(make_null_shared_ptr());
}
void
@@ -200,7 +200,7 @@ const std::shared_ptr<JobFailedState>
JobFailedState::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobFailedState");
- return make_shared_ptr(new JobFailedState(make_null_shared_ptr()));
+ return std::make_shared<JobFailedState>(make_null_shared_ptr());
}
void