aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-07 17:23:08 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-10 15:55:18 +0000
commit61901e5d8ff7a2718e16b1ce674ee7aedcef207c (patch)
treea3deeda58f965e206e32bdd5ab08b001cf9c7df5
parent79a451bdc08b1c7d9477796c94f55d882eacfa12 (diff)
downloadpaludis-61901e5d8ff7a2718e16b1ce674ee7aedcef207c.tar.gz
paludis-61901e5d8ff7a2718e16b1ce674ee7aedcef207c.tar.xz
Can const now
-rw-r--r--paludis/repositories/e/apply_annotations.cc11
-rw-r--r--paludis/repositories/e/apply_annotations.hh6
2 files changed, 8 insertions, 9 deletions
diff --git a/paludis/repositories/e/apply_annotations.cc b/paludis/repositories/e/apply_annotations.cc
index 818227d..8e4614e 100644
--- a/paludis/repositories/e/apply_annotations.cc
+++ b/paludis/repositories/e/apply_annotations.cc
@@ -24,6 +24,7 @@
#include <paludis/util/stringify.hh>
#include <paludis/util/log.hh>
#include <paludis/util/make_named_values.hh>
+#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/dep_spec_annotations.hh>
#include <paludis/dep_spec.hh>
@@ -33,8 +34,8 @@ using namespace paludis::erepository;
void
paludis::erepository::apply_annotations(
const EAPI & eapi,
- std::shared_ptr<DepSpec> & spec,
- std::shared_ptr<BlockDepSpec> & if_block_spec,
+ const std::shared_ptr<DepSpec> & spec,
+ const std::shared_ptr<BlockDepSpec> & if_block_spec,
const std::shared_ptr<const Map<std::string, std::string> > & m)
{
auto annotations(std::make_shared<DepSpecAnnotations>());
@@ -143,11 +144,9 @@ paludis::erepository::apply_annotations(
void
paludis::erepository::apply_annotations_not_block(
const EAPI & eapi,
- std::shared_ptr<DepSpec> & spec,
+ const std::shared_ptr<DepSpec> & spec,
const std::shared_ptr<const Map<std::string, std::string> > & m)
{
- std::shared_ptr<BlockDepSpec> not_block;
- apply_annotations(eapi, spec, not_block, m);
+ apply_annotations(eapi, spec, make_null_shared_ptr(), m);
}
-
diff --git a/paludis/repositories/e/apply_annotations.hh b/paludis/repositories/e/apply_annotations.hh
index 5cc67f0..03d09e8 100644
--- a/paludis/repositories/e/apply_annotations.hh
+++ b/paludis/repositories/e/apply_annotations.hh
@@ -31,13 +31,13 @@ namespace paludis
{
void apply_annotations(
const EAPI & eapi,
- std::shared_ptr<DepSpec> & spec,
- std::shared_ptr<BlockDepSpec> & if_block_spec,
+ const std::shared_ptr<DepSpec> & spec,
+ const std::shared_ptr<BlockDepSpec> & if_block_spec,
const std::shared_ptr<const Map<std::string, std::string> > & m);
void apply_annotations_not_block(
const EAPI & eapi,
- std::shared_ptr<DepSpec> & spec,
+ const std::shared_ptr<DepSpec> & spec,
const std::shared_ptr<const Map<std::string, std::string> > & m);
}
}