aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-11-11 16:57:00 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-11-11 16:57:00 +0000
commitef9e3356037b14848747d9955e561c41bd9bf7f6 (patch)
tree98732878acc8e799b9315f9de7d4ed6f1e8a2518
parentee5451e860fb571e4fadb7a865077d95bfaf9d24 (diff)
downloadpaludis-ef9e3356037b14848747d9955e561c41bd9bf7f6.tar.gz
paludis-ef9e3356037b14848747d9955e561c41bd9bf7f6.tar.xz
Fix GCC 3.4 build. From: kimrhh
-rw-r--r--paludis/install_task.cc2
-rw-r--r--paludis/package_database.cc4
-rw-r--r--paludis/util/tr1_memory.hh1
3 files changed, 4 insertions, 3 deletions
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index f58f8b3..5349bed 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -629,7 +629,7 @@ InstallTask::_main_actions()
/* fetch / install our entire list */
int x(0), y(std::count_if(_imp->dep_list.begin(), _imp->dep_list.end(),
- tr1::bind(std::equal_to<DepListEntryKind>(), dlk_package, tr1::bind<DepListEntryKind>(&DepListEntry::kind, _1)))),
+ tr1::bind(std::equal_to<DepListEntryKind>(), dlk_package, tr1::bind<DepListEntryKind>(tr1::mem_fn(&DepListEntry::kind), _1)))),
s(0), f(0);
for (DepList::Iterator dep(_imp->dep_list.begin()), dep_end(_imp->dep_list.end()) ;
diff --git a/paludis/package_database.cc b/paludis/package_database.cc
index 86cfabe..a40bfb8 100644
--- a/paludis/package_database.cc
+++ b/paludis/package_database.cc
@@ -405,7 +405,7 @@ PackageDatabase::query(const Query & q, const QueryOrder query_order) const
case qo_order_by_version:
{
PackageIDComparator c(this);
- result->sort(tr1::cref(c));
+ result->sort(tr1::bind(tr1::mem_fn(&PackageIDComparator::operator()), &c, _1, _2));
}
continue;
@@ -472,7 +472,7 @@ PackageDatabase::query(const Query & q, const QueryOrder query_order) const
result.reset(new PackageIDSequence);
std::copy(second_iterator(best.begin()), second_iterator(best.end()), result->back_inserter());
- result->sort(tr1::cref(c));
+ result->sort(tr1::bind(tr1::mem_fn(&PackageIDComparator::operator()), &c, _1, _2));
}
continue;
diff --git a/paludis/util/tr1_memory.hh b/paludis/util/tr1_memory.hh
index 9c8406c..dbfa9d5 100644
--- a/paludis/util/tr1_memory.hh
+++ b/paludis/util/tr1_memory.hh
@@ -37,6 +37,7 @@ namespace paludis
#elif defined(PALUDIS_TR1_MEMORY_IS_BOOST)
#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
namespace paludis
{