aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/package_mask_conf.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-05-20 16:22:51 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-05-20 16:22:51 +0000
commit4762032193e34e16b70ad04a029257ae61faee1f (patch)
treef4c079355526d80fc311682c639ce74140ba6b73 /paludis/environments/paludis/package_mask_conf.cc
parent7c70a0fc4a77810859f26adaf35969f00dbdd60c (diff)
downloadpaludis-4762032193e34e16b70ad04a029257ae61faee1f.tar.gz
paludis-4762032193e34e16b70ad04a029257ae61faee1f.tar.xz
Change how we access tr1 to make things easier for third party clients. Fixes: ticket:238
Diffstat (limited to 'paludis/environments/paludis/package_mask_conf.cc')
-rw-r--r--paludis/environments/paludis/package_mask_conf.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc
index 6216b8f39..860791efc 100644
--- a/paludis/environments/paludis/package_mask_conf.cc
+++ b/paludis/environments/paludis/package_mask_conf.cc
@@ -30,7 +30,7 @@
#include <paludis/util/tokeniser.hh>
#include <list>
#include <algorithm>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
using namespace paludis;
@@ -40,7 +40,7 @@ namespace paludis
struct Implementation<PackageMaskConf>
{
const PaludisEnvironment * const env;
- std::list<std::tr1::shared_ptr<const PackageDepSpec> > masks;
+ std::list<tr1::shared_ptr<const PackageDepSpec> > masks;
Implementation(const PaludisEnvironment * const e) :
env(e)
@@ -63,22 +63,22 @@ PackageMaskConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a package mask or unmask file:");
- std::tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
+ tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
if (! f)
return;
for (LineConfigFile::Iterator line(f->begin()), line_end(f->end()) ;
line != line_end ; ++line)
- _imp->masks.push_back(std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(*line, pds_pm_unspecific)));
+ _imp->masks.push_back(tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(*line, pds_pm_unspecific)));
}
bool
PackageMaskConf::query(const PackageDatabaseEntry & e) const
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
return indirect_iterator(_imp->masks.end()) != std::find_if(
indirect_iterator(_imp->masks.begin()),
indirect_iterator(_imp->masks.end()),
- std::tr1::bind(&match_package, std::tr1::ref(*_imp->env), _1, e));
+ tr1::bind(&match_package, tr1::ref(*_imp->env), _1, e));
}