aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
authorAvatar Piotr Jaroszyński <peper@gentoo.org> 2007-08-17 22:03:04 +0000
committerAvatar Piotr Jaroszyński <peper@gentoo.org> 2007-08-17 22:03:04 +0000
commit9aa45a385b95c196fd4cc658be5be1ae700f7ba9 (patch)
treee5faa0a0226a69103e606086e9eab6a0848eccc0 /paludis
parent20b595a9d0f776bd4f43b0ed922d69d54bf17398 (diff)
downloadpaludis-9aa45a385b95c196fd4cc658be5be1ae700f7ba9.tar.gz
paludis-9aa45a385b95c196fd4cc658be5be1ae700f7ba9.tar.xz
(python) Allow subclassing of Environment, Masks and MetadataKeys.
Diffstat (limited to 'paludis')
-rw-r--r--paludis/dep_list/dep_list.cc2
-rw-r--r--paludis/package_id.cc4
-rw-r--r--paludis/package_id.hh2
3 files changed, 4 insertions, 4 deletions
diff --git a/paludis/dep_list/dep_list.cc b/paludis/dep_list/dep_list.cc
index 0605ad104..74f5864e2 100644
--- a/paludis/dep_list/dep_list.cc
+++ b/paludis/dep_list/dep_list.cc
@@ -411,7 +411,7 @@ DepList::AddVisitor::visit_leaf(const PackageDepSpec & a)
bool local_success(false);
for (DepListOverrideMasksFunctions::Iterator o(d->_imp->opts->override_masks->begin()),
o_end(next(of)) ; o != o_end ; ++o)
- if ((*o)(**p, *m))
+ if ((*o)(**p, **m))
local_success = true;
success &= local_success;
diff --git a/paludis/package_id.cc b/paludis/package_id.cc
index 810712df5..0707b7fe9 100644
--- a/paludis/package_id.cc
+++ b/paludis/package_id.cc
@@ -100,14 +100,14 @@ PackageID::MasksIterator
PackageID::begin_masks() const
{
need_masks_added();
- return MasksIterator(indirect_iterator(_imp->masks.begin()));
+ return MasksIterator(_imp->masks.begin());
}
PackageID::MasksIterator
PackageID::end_masks() const
{
need_masks_added();
- return MasksIterator(indirect_iterator(_imp->masks.end()));
+ return MasksIterator(_imp->masks.end());
}
bool
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index 756c834fc..83c7e8536 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -113,7 +113,7 @@ namespace paludis
///\name Masks
///\{
- typedef libwrapiter::ForwardIterator<PackageID, const Mask> MasksIterator;
+ typedef libwrapiter::ForwardIterator<PackageID, tr1::shared_ptr<const Mask> > MasksIterator;
MasksIterator begin_masks() const PALUDIS_ATTRIBUTE((warn_unused_result));
MasksIterator end_masks() const PALUDIS_ATTRIBUTE((warn_unused_result));
bool masked() const PALUDIS_ATTRIBUTE((warn_unused_result));