aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-10 21:10:24 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-10 21:56:33 +0000
commit8f2189c7fde4aa134e954a1ff1040d09c826cfaf (patch)
tree9d909371711b153f633e30c7b370f8ac9c502735
parent57e75ec95dffd6bccd5bfa3dbb2544d53d3f05f6 (diff)
downloadpaludis-8f2189c7fde4aa134e954a1ff1040d09c826cfaf.tar.gz
paludis-8f2189c7fde4aa134e954a1ff1040d09c826cfaf.tar.xz
Don't need blocks here any more
-rw-r--r--paludis/repositories/e/apply_annotations.cc10
-rw-r--r--paludis/repositories/e/apply_annotations.hh6
-rw-r--r--paludis/repositories/e/dep_parser.cc16
3 files changed, 8 insertions, 24 deletions
diff --git a/paludis/repositories/e/apply_annotations.cc b/paludis/repositories/e/apply_annotations.cc
index 695458d..d8ba390 100644
--- a/paludis/repositories/e/apply_annotations.cc
+++ b/paludis/repositories/e/apply_annotations.cc
@@ -35,7 +35,6 @@ void
paludis::erepository::apply_annotations(
const EAPI & eapi,
const std::shared_ptr<DepSpec> & spec,
- const std::shared_ptr<BlockDepSpec> &,
const std::shared_ptr<const Map<std::string, std::string> > & m)
{
auto annotations(std::make_shared<DepSpecAnnotations>());
@@ -127,12 +126,3 @@ paludis::erepository::apply_annotations(
spec->set_annotations(annotations);
}
-void
-paludis::erepository::apply_annotations_not_block(
- const EAPI & eapi,
- const std::shared_ptr<DepSpec> & spec,
- const std::shared_ptr<const Map<std::string, std::string> > & 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 03d09e8..5e512fe 100644
--- a/paludis/repositories/e/apply_annotations.hh
+++ b/paludis/repositories/e/apply_annotations.hh
@@ -32,12 +32,6 @@ namespace paludis
void apply_annotations(
const EAPI & eapi,
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,
- const std::shared_ptr<DepSpec> & spec,
const std::shared_ptr<const Map<std::string, std::string> > & m);
}
}
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index 9dc86ff..3baa564 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -421,7 +421,7 @@ namespace
const BlockFixOp & block_fix_op,
const std::shared_ptr<const Map<std::string, std::string> > & m)
{
- apply_annotations(eapi, spec, if_block_spec, m);
+ apply_annotations(eapi, spec, m);
fix_block_annotations(if_block_spec, block_fix_op);
}
}
@@ -491,7 +491,7 @@ paludis::erepository::parse_provide(const std::string & s, const Environment * c
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
n::on_all() = std::bind(&any_all_handler<ProvideSpecTree, AllDepSpec>, std::ref(stack)),
- n::on_annotations() = std::bind(&apply_annotations_not_block, std::cref(eapi), std::ref(thing_to_annotate), _1),
+ n::on_annotations() = std::bind(&apply_annotations, std::cref(eapi), std::ref(thing_to_annotate), _1),
n::on_any() = std::bind(&any_not_allowed_handler, s),
n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
n::on_error() = std::bind(&error_handler, s, _1),
@@ -531,7 +531,7 @@ paludis::erepository::parse_fetchable_uri(const std::string & s, const Environme
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
n::on_all() = std::bind(&any_all_handler<FetchableURISpecTree, AllDepSpec>, std::ref(stack)),
- n::on_annotations() = std::bind(&apply_annotations_not_block, std::cref(eapi), std::ref(thing_to_annotate), _1),
+ n::on_annotations() = std::bind(&apply_annotations, std::cref(eapi), std::ref(thing_to_annotate), _1),
n::on_any() = std::bind(&any_not_allowed_handler, s),
n::on_arrow() = std::bind(&arrow_handler<FetchableURISpecTree>, std::ref(stack),
ParseStackTypes<FetchableURISpecTree>::AnnotationsGoHere(std::bind(
@@ -575,7 +575,7 @@ paludis::erepository::parse_simple_uri(const std::string & s, const Environment
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
n::on_all() = std::bind(&any_all_handler<SimpleURISpecTree, AllDepSpec>, std::ref(stack)),
- n::on_annotations() = std::bind(&apply_annotations_not_block, std::cref(eapi), std::ref(thing_to_annotate), _1),
+ n::on_annotations() = std::bind(&apply_annotations, std::cref(eapi), std::ref(thing_to_annotate), _1),
n::on_any() = std::bind(&any_not_allowed_handler, s),
n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
n::on_error() = std::bind(&error_handler, s, _1),
@@ -615,7 +615,7 @@ paludis::erepository::parse_license(const std::string & s, const Environment * c
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
n::on_all() = std::bind(&any_all_handler<LicenseSpecTree, AllDepSpec>, std::ref(stack)),
- n::on_annotations() = std::bind(&apply_annotations_not_block, std::cref(eapi), std::ref(thing_to_annotate), _1),
+ n::on_annotations() = std::bind(&apply_annotations, std::cref(eapi), std::ref(thing_to_annotate), _1),
n::on_any() = std::bind(&any_all_handler<LicenseSpecTree, AnyDepSpec>, std::ref(stack)),
n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
n::on_error() = std::bind(&error_handler, s, _1),
@@ -655,7 +655,7 @@ paludis::erepository::parse_plain_text(const std::string & s, const Environment
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
n::on_all() = std::bind(&any_all_handler<PlainTextSpecTree, AllDepSpec>, std::ref(stack)),
- n::on_annotations() = std::bind(&apply_annotations_not_block, std::cref(eapi), std::ref(thing_to_annotate), _1),
+ n::on_annotations() = std::bind(&apply_annotations, std::cref(eapi), std::ref(thing_to_annotate), _1),
n::on_any() = std::bind(&any_not_allowed_handler, s),
n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
n::on_error() = std::bind(&error_handler, s, _1),
@@ -695,7 +695,7 @@ paludis::erepository::parse_myoptions(const std::string & s, const Environment *
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
n::on_all() = std::bind(&any_all_handler<PlainTextSpecTree, AllDepSpec>, std::ref(stack)),
- n::on_annotations() = std::bind(&apply_annotations_not_block, std::cref(eapi), std::ref(thing_to_annotate), _1),
+ n::on_annotations() = std::bind(&apply_annotations, std::cref(eapi), std::ref(thing_to_annotate), _1),
n::on_any() = std::bind(&any_not_allowed_handler, s),
n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
n::on_error() = std::bind(&error_handler, s, _1),
@@ -737,7 +737,7 @@ paludis::erepository::parse_required_use(const std::string & s, const Environmen
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
n::on_all() = std::bind(&any_all_handler<RequiredUseSpecTree, AllDepSpec>, std::ref(stack)),
- n::on_annotations() = std::bind(&apply_annotations_not_block, std::cref(eapi), std::ref(thing_to_annotate), _1),
+ n::on_annotations() = std::bind(&apply_annotations, std::cref(eapi), std::ref(thing_to_annotate), _1),
n::on_any() = std::bind(&any_all_handler<RequiredUseSpecTree, AnyDepSpec>, std::ref(stack)),
n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
n::on_error() = std::bind(&error_handler, s, _1),