aboutsummaryrefslogtreecommitdiff
path: root/paludis/resolver/sanitised_dependencies.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2013-05-16 20:18:39 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2013-05-22 23:19:27 +0100
commit0174215ed434594d9288e38575a3aa41e2b10842 (patch)
tree6037c4c58a100e5a0cbca30ac7f3d911d8d57032 /paludis/resolver/sanitised_dependencies.cc
parent78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (diff)
downloadpaludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.gz
paludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.xz
Use nullptr
Diffstat (limited to 'paludis/resolver/sanitised_dependencies.cc')
-rw-r--r--paludis/resolver/sanitised_dependencies.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/paludis/resolver/sanitised_dependencies.cc b/paludis/resolver/sanitised_dependencies.cc
index 8012fe403..794c206a6 100644
--- a/paludis/resolver/sanitised_dependencies.cc
+++ b/paludis/resolver/sanitised_dependencies.cc
@@ -388,7 +388,7 @@ namespace
));
}
else
- return make_null_shared_ptr();
+ return nullptr;
}
void visit(const DependencySpecTree::NodeType<PackageDepSpec>::Type & node)
@@ -567,7 +567,7 @@ SanitisedDependency::deserialise(Deserialisation & d, const std::shared_ptr<cons
return make_named_values<SanitisedDependency>(
n::active_conditions_as_string() = v.member<std::string>("active_conditions_as_string"),
- n::active_dependency_labels() = make_null_shared_ptr(),
+ n::active_dependency_labels() = nullptr,
n::active_dependency_labels_as_string() = v.member<std::string>("active_dependency_labels_as_string"),
n::active_dependency_labels_classifier() = v.member<std::shared_ptr<const LabelsClassifier> >("active_dependency_labels_classifier"),
n::from_id() = v.member<std::shared_ptr<const PackageID> >("from_id"),