aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2009-02-15 18:39:34 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2009-02-15 18:39:34 +0000
commitfa3f1d98c374fd02fecbd9813d68261dd456119d (patch)
tree1700a7a62be9ae93bdf70659ddf8c511bc8255f4
parent0361486bbadd50eaa1bfe97749b69261e55cdce9 (diff)
downloadpaludis-fa3f1d98c374fd02fecbd9813d68261dd456119d.tar.gz
paludis-fa3f1d98c374fd02fecbd9813d68261dd456119d.tar.xz
G++ 4.1 sucks
-rw-r--r--paludis/output_manager_from_environment.cc5
-rw-r--r--paludis/sync_task.cc4
2 files changed, 6 insertions, 3 deletions
diff --git a/paludis/output_manager_from_environment.cc b/paludis/output_manager_from_environment.cc
index 0768f30..2d98f25 100644
--- a/paludis/output_manager_from_environment.cc
+++ b/paludis/output_manager_from_environment.cc
@@ -63,7 +63,10 @@ const std::tr1::shared_ptr<OutputManager>
OutputManagerFromEnvironment::operator() (const Action & a)
{
if (! _imp->result)
- _imp->result = _imp->env->create_output_manager(CreateOutputManagerForPackageIDActionInfo(_imp->id, a, _imp->output_exclusivity));
+ {
+ CreateOutputManagerForPackageIDActionInfo info(_imp->id, a, _imp->output_exclusivity);
+ _imp->result = _imp->env->create_output_manager(info);
+ }
return _imp->result;
}
diff --git a/paludis/sync_task.cc b/paludis/sync_task.cc
index b884f12..a08177d 100644
--- a/paludis/sync_task.cc
+++ b/paludis/sync_task.cc
@@ -115,8 +115,8 @@ namespace
}
std::tr1::shared_ptr<const Repository> rr(env->package_database()->fetch_repository(r));
- std::tr1::shared_ptr<OutputManager> output_manager(env->create_output_manager(
- CreateOutputManagerForRepositorySyncInfo(*rr, oe_exclusive)));
+ CreateOutputManagerForRepositorySyncInfo info(*rr, oe_exclusive);
+ std::tr1::shared_ptr<OutputManager> output_manager(env->create_output_manager(info));
if ((*rr).syncable_interface() && (*rr).syncable_interface()->sync(output_manager))
{
Lock l(mutex);