aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/world.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-09-01 17:42:20 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-09-01 17:43:52 +0100
commitad761cd5e507e344ebc5f0c467b04f7d3dc729a3 (patch)
tree757c7ee5e72715d25d8127bc2b3369b2161fbe6d /paludis/environments/paludis/world.cc
parent4197530f623ce9c9653b724baeda36efb08c3e63 (diff)
downloadpaludis-ad761cd5e507e344ebc5f0c467b04f7d3dc729a3.tar.gz
paludis-ad761cd5e507e344ebc5f0c467b04f7d3dc729a3.tar.xz
updso_serialised
Diffstat (limited to 'paludis/environments/paludis/world.cc')
-rw-r--r--paludis/environments/paludis/world.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc
index f78daca14..7bccd2a1e 100644
--- a/paludis/environments/paludis/world.cc
+++ b/paludis/environments/paludis/world.cc
@@ -118,7 +118,9 @@ World::_add_string_to_world(const std::string & n) const
SetFile world(make_named_values<SetFileParams>(
value_for<n::environment>(_imp->env),
value_for<n::file_name>(*_imp->maybe_world_file),
- value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All())),
+ value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env,
+ UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All(),
+ make_null_shared_ptr())),
value_for<n::set_operator_mode>(sfsmo_natural),
value_for<n::tag>(std::tr1::shared_ptr<DepTag>()),
value_for<n::type>(sft_simple)
@@ -148,7 +150,9 @@ World::_remove_string_from_world(const std::string & n) const
SetFile world(make_named_values<SetFileParams>(
value_for<n::environment>(_imp->env),
value_for<n::file_name>(*_imp->maybe_world_file),
- value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All())),
+ value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env,
+ UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All(),
+ make_null_shared_ptr())),
value_for<n::set_operator_mode>(sfsmo_natural),
value_for<n::tag>(std::tr1::shared_ptr<DepTag>()),
value_for<n::type>(sft_simple)
@@ -173,7 +177,9 @@ World::world_set() const
SetFile world(make_named_values<SetFileParams>(
value_for<n::environment>(_imp->env),
value_for<n::file_name>(*_imp->maybe_world_file),
- value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All())),
+ value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env,
+ UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All(),
+ make_null_shared_ptr())),
value_for<n::set_operator_mode>(sfsmo_natural),
value_for<n::tag>(tag),
value_for<n::type>(sft_simple)