aboutsummaryrefslogtreecommitdiff
path: root/paludis/elike_package_dep_spec.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/elike_package_dep_spec.cc')
-rw-r--r--paludis/elike_package_dep_spec.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/paludis/elike_package_dep_spec.cc b/paludis/elike_package_dep_spec.cc
index c2f7c9a..c509151 100644
--- a/paludis/elike_package_dep_spec.cc
+++ b/paludis/elike_package_dep_spec.cc
@@ -180,8 +180,8 @@ paludis::elike_remove_trailing_square_bracket_if_exists(std::string & s, Partial
VersionSpec vs(ver, version_options);
result.version_requirement(make_named_values<VersionRequirement>(
- value_for<n::version_operator>(vop),
- value_for<n::version_spec>(vs)));
+ n::version_operator() = vop,
+ n::version_spec() = vs));
had_bracket_version_requirements = true;
}
}
@@ -432,8 +432,8 @@ void
paludis::elike_add_version_requirement(const VersionOperator & op, const VersionSpec & spec, PartiallyMadePackageDepSpec & result)
{
result.version_requirement(make_named_values<VersionRequirement>(
- value_for<n::version_operator>(op),
- value_for<n::version_spec>(spec)));
+ n::version_operator() = op,
+ n::version_spec() = spec));
}
void
@@ -484,18 +484,18 @@ paludis::partial_parse_elike_package_dep_spec(
o += pmpdso_always_use_ranged_deps;
return partial_parse_generic_elike_package_dep_spec(ss, make_named_values<GenericELikePackageDepSpecParseFunctions>(
- value_for<n::add_package_requirement>(std::tr1::bind(&elike_add_package_requirement, _1, _2)),
- value_for<n::add_version_requirement>(std::tr1::bind(&elike_add_version_requirement, _1, _2, _3)),
- value_for<n::check_sanity>(&elike_check_sanity),
- value_for<n::get_remove_trailing_version>(std::tr1::bind(&elike_get_remove_trailing_version, _1, version_options)),
- value_for<n::get_remove_version_operator>(std::tr1::bind(&elike_get_remove_version_operator, _1, options)),
- value_for<n::has_version_operator>(std::tr1::bind(&elike_has_version_operator, _1,
- std::tr1::cref(had_bracket_version_requirements), options)),
- value_for<n::options_for_partially_made_package_dep_spec>(std::tr1::bind(&fixed_options_for_partially_made_package_dep_spec, o)),
- value_for<n::remove_trailing_repo_if_exists>(std::tr1::bind(&elike_remove_trailing_repo_if_exists, _1, _2, options)),
- value_for<n::remove_trailing_slot_if_exists>(std::tr1::bind(&elike_remove_trailing_slot_if_exists, _1, _2, options)),
- value_for<n::remove_trailing_square_bracket_if_exists>(std::tr1::bind(&elike_remove_trailing_square_bracket_if_exists,
- _1, _2, options, version_options, std::tr1::ref(had_bracket_version_requirements), std::tr1::ref(had_use_requirements), id))
+ n::add_package_requirement() = std::tr1::bind(&elike_add_package_requirement, _1, _2),
+ n::add_version_requirement() = std::tr1::bind(&elike_add_version_requirement, _1, _2, _3),
+ n::check_sanity() = &elike_check_sanity,
+ n::get_remove_trailing_version() = std::tr1::bind(&elike_get_remove_trailing_version, _1, version_options),
+ n::get_remove_version_operator() = std::tr1::bind(&elike_get_remove_version_operator, _1, options),
+ n::has_version_operator() = std::tr1::bind(&elike_has_version_operator, _1,
+ std::tr1::cref(had_bracket_version_requirements), options),
+ n::options_for_partially_made_package_dep_spec() = std::tr1::bind(&fixed_options_for_partially_made_package_dep_spec, o),
+ n::remove_trailing_repo_if_exists() = std::tr1::bind(&elike_remove_trailing_repo_if_exists, _1, _2, options),
+ n::remove_trailing_slot_if_exists() = std::tr1::bind(&elike_remove_trailing_slot_if_exists, _1, _2, options),
+ n::remove_trailing_square_bracket_if_exists() = std::tr1::bind(&elike_remove_trailing_square_bracket_if_exists,
+ _1, _2, options, version_options, std::tr1::ref(had_bracket_version_requirements), std::tr1::ref(had_use_requirements), id)
));
}