aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/virtuals
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-22 23:23:34 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-22 23:23:34 +0000
commitc05f56916407d1730903472718fed9576bd214c9 (patch)
tree4ee1d0cc171813a37e889e15acedaeca3d3aa50e /paludis/repositories/virtuals
parentd145928e6b0283eb9816d34332d4d062b21598b3 (diff)
downloadpaludis-c05f56916407d1730903472718fed9576bd214c9.tar.gz
paludis-c05f56916407d1730903472718fed9576bd214c9.tar.xz
Don't store keys, IDs in masks
Diffstat (limited to 'paludis/repositories/virtuals')
-rw-r--r--paludis/repositories/virtuals/package_id.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index c6b20de1d..d96ec3d34 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -462,11 +462,11 @@ namespace
public AssociationMask
{
private:
- const std::shared_ptr<const PackageID> _id;
+ const PackageDepSpec _spec;
public:
- VirtualsAssociationMask(const std::shared_ptr<const PackageID> & i) :
- _id(i)
+ VirtualsAssociationMask(const PackageDepSpec & s) :
+ _spec(s)
{
}
@@ -480,9 +480,9 @@ namespace
return "by association";
}
- const std::shared_ptr<const PackageID> associated_package() const
+ const PackageDepSpec associated_package_spec() const
{
- return _id;
+ return _spec;
}
};
}
@@ -496,7 +496,7 @@ VirtualsPackageID::need_masks_added() const
return;
if (_imp->virtual_for->value()->masked())
- add_mask(std::make_shared<VirtualsAssociationMask>(_imp->virtual_for->value()));
+ add_mask(std::make_shared<VirtualsAssociationMask>(_imp->virtual_for->value()->uniquely_identifying_spec()));
_imp->has_masks = true;
}