aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-01-23 06:56:30 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-01-23 06:56:30 +0000
commit950188b3424c66b395db6583073533d6cbf5e421 (patch)
treecc01c7fb84327e96e3e2d8abc5083e42c22b6159 /src
parent91684c275c862aebc7272b7907a092a525b6f7c9 (diff)
downloadpaludis-950188b3424c66b395db6583073533d6cbf5e421.tar.gz
paludis-950188b3424c66b395db6583073533d6cbf5e421.tar.xz
Fix compile with icc 10.1
Diffstat (limited to 'src')
-rw-r--r--src/clients/accerso/accerso.cc7
-rw-r--r--src/clients/inquisitio/do_search.cc4
-rw-r--r--src/clients/instruo/instruo.cc6
-rw-r--r--src/clients/reconcilio/util/wildcard_expander_TEST.cc2
4 files changed, 7 insertions, 12 deletions
diff --git a/src/clients/accerso/accerso.cc b/src/clients/accerso/accerso.cc
index 7f4f329..ca245fc 100644
--- a/src/clients/accerso/accerso.cc
+++ b/src/clients/accerso/accerso.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -111,9 +111,8 @@ main(int argc, char *argv[])
tr1::shared_ptr<const PackageIDSequence> ids(
env.package_database()->query(query::Repository(env.main_repository()->name()), qo_order_by_version));
- PackageIDComparator comparator(env.package_database().get());
- std::multimap<tr1::shared_ptr<const PackageID>, std::string, tr1::reference_wrapper<const PackageIDComparator> >
- results(tr1::cref(comparator));
+ std::multimap<tr1::shared_ptr<const PackageID>, std::string, PackageIDComparator> results(PackageIDComparator(
+ env.package_database().get()));
unsigned success(0), total(0);
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
diff --git a/src/clients/inquisitio/do_search.cc b/src/clients/inquisitio/do_search.cc
index cd502f1..f6e743a 100644
--- a/src/clients/inquisitio/do_search.cc
+++ b/src/clients/inquisitio/do_search.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -125,7 +125,7 @@ namespace
{
std::list<tr1::shared_ptr<const PackageID> > sids(ids->begin(), ids->end());
PackageIDComparator c(env.package_database().get());
- sids.sort(tr1::ref(c));
+ sids.sort(c);
for (std::list<tr1::shared_ptr<const PackageID> >::const_reverse_iterator i(sids.rbegin()), i_end(sids.rend()) ;
i != i_end ; ++i)
diff --git a/src/clients/instruo/instruo.cc b/src/clients/instruo/instruo.cc
index b8f8e1c..4bb924a 100644
--- a/src/clients/instruo/instruo.cc
+++ b/src/clients/instruo/instruo.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -228,9 +228,7 @@ main(int argc, char *argv[])
tr1::shared_ptr<const PackageIDSequence> ids(
env.package_database()->query(query::Repository(env.main_repository()->name()), qo_order_by_version));
- PackageIDComparator comparator(env.package_database().get());
- std::multimap<tr1::shared_ptr<const PackageID>, std::string, tr1::reference_wrapper<const PackageIDComparator> >
- results(tr1::cref(comparator));
+ std::multimap<tr1::shared_ptr<const PackageID>, std::string, PackageIDComparator> results(env.package_database().get());
unsigned success(0), total(0);
CategoryNamePart old_cat("OLDCAT");
diff --git a/src/clients/reconcilio/util/wildcard_expander_TEST.cc b/src/clients/reconcilio/util/wildcard_expander_TEST.cc
index 51e47dc..e1bf74d 100644
--- a/src/clients/reconcilio/util/wildcard_expander_TEST.cc
+++ b/src/clients/reconcilio/util/wildcard_expander_TEST.cc
@@ -42,8 +42,6 @@ namespace test_cases
void run()
{
- FSEntry myroot(FSEntry::cwd() / "wildcard_expander_TEST_dir");
-
TEST_CHECK_EQUAL(expand("/xyz*zy"), "/xyz1zy /xyz22zy /xyzzy");
TEST_CHECK_EQUAL(expand("/plugh"), "/plugh");
TEST_CHECK_EQUAL(expand("/quux"), "/quux");