aboutsummaryrefslogtreecommitdiff
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
parent91684c275c862aebc7272b7907a092a525b6f7c9 (diff)
downloadpaludis-950188b3424c66b395db6583073533d6cbf5e421.tar.gz
paludis-950188b3424c66b395db6583073533d6cbf5e421.tar.xz
Fix compile with icc 10.1
-rw-r--r--configure.ac2
-rw-r--r--paludis/args/man.cc6
-rw-r--r--paludis/dep_spec.cc4
-rw-r--r--paludis/dep_tag.cc7
-rw-r--r--paludis/install_task.cc4
-rw-r--r--paludis/metadata_key.cc4
-rw-r--r--paludis/name.cc4
-rw-r--r--paludis/package_id.cc10
-rw-r--r--paludis/package_id.hh3
-rw-r--r--paludis/repositories/cran/keys.cc3
-rw-r--r--paludis/repositories/cran/masks.cc3
-rw-r--r--paludis/repositories/e/e_repository.cc2
-rw-r--r--paludis/repositories/e/ebuild_id.cc13
-rw-r--r--paludis/repositories/e/qa/qa_checks_group.cc4
-rw-r--r--paludis/repositories/e/qa/repo_name.cc4
-rw-r--r--paludis/repositories/fake/fake_package_id.cc4
-rw-r--r--paludis/repositories/gems/yaml.cc4
-rw-r--r--paludis/repositories/unpackaged/ndbam.cc15
-rw-r--r--paludis/use_requirements.cc14
-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
23 files changed, 69 insertions, 60 deletions
diff --git a/configure.ac b/configure.ac
index e1ec4d5..1164f1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -594,10 +594,12 @@ if test "x${cxx_compiler_icc}" = "xyes" ; then
CHECK_CXXFLAG([-wd383])
CHECK_CXXFLAG([-wd444])
CHECK_CXXFLAG([-wd488])
+ CHECK_CXXFLAG([-wd525])
CHECK_CXXFLAG([-wd810])
CHECK_CXXFLAG([-wd981])
CHECK_CXXFLAG([-wd1125])
CHECK_CXXFLAG([-wd1418])
+ CHECK_CXXFLAG([-wd1419])
PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC=$PALUDIS_CXXFLAGS
elif test "x${ac_cv_cxx_compiler_gnu}" = "xyes" ; then
CHECK_CXXFLAG([-Wall])
diff --git a/paludis/args/man.cc b/paludis/args/man.cc
index adbc09b..a4163b1 100644
--- a/paludis/args/man.cc
+++ b/paludis/args/man.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 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
@@ -40,10 +40,6 @@ namespace
{
}
- void visit(const ArgsOption &)
- {
- }
-
void visit(const StringArg &)
{
}
diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc
index 6ef2ab0..7735871 100644
--- a/paludis/dep_spec.cc
+++ b/paludis/dep_spec.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 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
@@ -361,7 +361,7 @@ LabelsDepSpec<T_>::clone() const
{
using namespace tr1::placeholders;
tr1::shared_ptr<LabelsDepSpec<T_> > my_clone(new LabelsDepSpec<T_>);
- std::for_each(begin(), end(), tr1::bind(&LabelsDepSpec<T_>::add_label, my_clone, _1));
+ std::for_each(begin(), end(), tr1::bind(tr1::mem_fn(&LabelsDepSpec<T_>::add_label), my_clone.get(), _1));
return my_clone;
}
diff --git a/paludis/dep_tag.cc b/paludis/dep_tag.cc
index 107390a..b7f67fe 100644
--- a/paludis/dep_tag.cc
+++ b/paludis/dep_tag.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 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
@@ -207,11 +207,6 @@ namespace
}
void
- visit_leaf(const URILabelsDepSpec &)
- {
- }
-
- void
visit_leaf(const DependencyLabelsDepSpec & l)
{
std::copy(indirect_iterator(l.begin()), indirect_iterator(l.end()),
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index cc4d196..2e7227b 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 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
@@ -203,7 +203,7 @@ InstallTask::add_target(const std::string & target)
_imp->targets->add(tr1::shared_ptr<TreeLeaf<SetSpecTree, PackageDepSpec> >(
new TreeLeaf<SetSpecTree, PackageDepSpec>(spec)));
}
- catch (const NoSuchPackageError & e)
+ catch (const NoSuchPackageError &)
{
_imp->had_resolution_failures = true;
throw;
diff --git a/paludis/metadata_key.cc b/paludis/metadata_key.cc
index 9517ced..9db72bc 100644
--- a/paludis/metadata_key.cc
+++ b/paludis/metadata_key.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
@@ -216,10 +216,10 @@ template class MetadataCollectionKey<FSEntrySequence>;
template class MetadataSpecTreeKey<LicenseSpecTree>;
template class MetadataSpecTreeKey<ProvideSpecTree>;
-template class MetadataSpecTreeKey<DependencySpecTree>;
template class MetadataSpecTreeKey<RestrictSpecTree>;
#ifndef PALUDIS_NO_EXPLICIT_FULLY_SPECIALISED
template class MetadataSpecTreeKey<FetchableURISpecTree>;
+template class MetadataSpecTreeKey<DependencySpecTree>;
#endif
template class MetadataSpecTreeKey<SimpleURISpecTree>;
diff --git a/paludis/name.cc b/paludis/name.cc
index 453102d..c31e978 100644
--- a/paludis/name.cc
+++ b/paludis/name.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 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
@@ -116,7 +116,7 @@ UseFlagNameValidator::validate(const std::string & s)
validate(s.substr(0, t));
validate(s.substr(t + 1));
}
- catch (const UseFlagNameError & e)
+ catch (const UseFlagNameError &)
{
break;
}
diff --git a/paludis/package_id.cc b/paludis/package_id.cc
index 02f85d5..f5aa643 100644
--- a/paludis/package_id.cc
+++ b/paludis/package_id.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
@@ -45,6 +45,8 @@ using namespace paludis;
template class Sequence<tr1::shared_ptr<const PackageID> >;
template class WrappedForwardIterator<Sequence<tr1::shared_ptr<const PackageID> >::ConstIteratorTag,
const tr1::shared_ptr<const PackageID> >;
+template class WrappedForwardIterator<Sequence<tr1::shared_ptr<const PackageID> >::ReverseConstIteratorTag,
+ const tr1::shared_ptr<const PackageID> >;
template class WrappedOutputIterator<Sequence<tr1::shared_ptr<const PackageID> >::InserterTag,
tr1::shared_ptr<const PackageID> >;
@@ -212,6 +214,12 @@ PackageIDComparator::PackageIDComparator(const PackageDatabase * const db) :
_imp->m.insert(std::make_pair((*r)->name(), ++c));
}
+PackageIDComparator::PackageIDComparator(const PackageIDComparator & other) :
+ PrivateImplementationPattern<PackageIDComparator>(new Implementation<PackageIDComparator>)
+{
+ _imp->m = other._imp->m;
+}
+
PackageIDComparator::~PackageIDComparator()
{
}
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index a955bdd..822fedb 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -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
@@ -447,6 +447,7 @@ namespace paludis
///\{
PackageIDComparator(const PackageDatabase * const);
+ PackageIDComparator(const PackageIDComparator &);
~PackageIDComparator();
///\}
diff --git a/paludis/repositories/cran/keys.cc b/paludis/repositories/cran/keys.cc
index 68c83b3..edced01 100644
--- a/paludis/repositories/cran/keys.cc
+++ b/paludis/repositories/cran/keys.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
@@ -28,6 +28,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/tr1_functional.hh>
#include <paludis/util/indirect_iterator-impl.hh>
+#include <paludis/util/visitor-impl.hh>
#include <paludis/dep_spec.hh>
#include <paludis/stringify_formatter-impl.hh>
#include <paludis/formatter.hh>
diff --git a/paludis/repositories/cran/masks.cc b/paludis/repositories/cran/masks.cc
index ffda9b8..f498ff8 100644
--- a/paludis/repositories/cran/masks.cc
+++ b/paludis/repositories/cran/masks.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
@@ -19,6 +19,7 @@
#include "masks.hh"
#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/visitor-impl.hh>
using namespace paludis;
using namespace paludis::cranrepository;
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 15060bf..c9ea0a6 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -793,7 +793,7 @@ ERepository::sync() const
{
syncer.sync(opts);
}
- catch (const SyncFailedError & e)
+ catch (const SyncFailedError &)
{
continue;
}
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index b37a820..94bd8c4 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -52,19 +52,6 @@
using namespace paludis;
using namespace paludis::erepository;
-namespace
-{
- std::string file_contents(const FSEntry & f)
- {
- Context c("When reading '" + stringify(f) + "':");
- std::ifstream i(stringify(f).c_str());
- if (! i)
- throw ConfigurationError("Cannot open '" + stringify(f) + "' for read");
-
- return std::string((std::istreambuf_iterator<char>(i)), std::istreambuf_iterator<char>());
- }
-}
-
namespace paludis
{
template <>
diff --git a/paludis/repositories/e/qa/qa_checks_group.cc b/paludis/repositories/e/qa/qa_checks_group.cc
index 26b86e3..2a8bab6 100644
--- a/paludis/repositories/e/qa/qa_checks_group.cc
+++ b/paludis/repositories/e/qa/qa_checks_group.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
@@ -35,7 +35,9 @@ using namespace paludis::erepository;
namespace paludis
{
+#ifndef PALUDIS_NO_DOUBLE_TEMPLATE
template <>
+#endif
template <typename T_>
struct Implementation<QAChecksGroup<T_> >
{
diff --git a/paludis/repositories/e/qa/repo_name.cc b/paludis/repositories/e/qa/repo_name.cc
index a8d2c84..a8a91b9 100644
--- a/paludis/repositories/e/qa/repo_name.cc
+++ b/paludis/repositories/e/qa/repo_name.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
@@ -51,7 +51,7 @@ paludis::erepository::repo_name_check(
{
RepositoryName n(line);
}
- catch (const RepositoryNameError & e)
+ catch (const RepositoryNameError &)
{
reporter.message(QAMessage(dir / "profiles" / "repo_name", qaml_normal, name,
"repo_name not a valid repository name"));
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index 15cb48f..9210212 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.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
@@ -1034,11 +1034,11 @@ FakeMetadataKeywordSetKey::pretty_print_flat(const Formatter<KeywordName> & f) c
template class FakeMetadataSpecTreeKey<LicenseSpecTree>;
template class FakeMetadataSpecTreeKey<ProvideSpecTree>;
-template class FakeMetadataSpecTreeKey<DependencySpecTree>;
template class FakeMetadataSpecTreeKey<RestrictSpecTree>;
#ifndef PALUDIS_NO_EXPLICIT_FULLY_SPECIALISED
template class FakeMetadataSpecTreeKey<FetchableURISpecTree>;
template class FakeMetadataSpecTreeKey<DependencySpecTree>;
+template class FakeMetadataSpecTreeKey<DependencySpecTree>;
#endif
template class FakeMetadataSpecTreeKey<SimpleURISpecTree>;
diff --git a/paludis/repositories/gems/yaml.cc b/paludis/repositories/gems/yaml.cc
index c7c0c63..3c64c1b 100644
--- a/paludis/repositories/gems/yaml.cc
+++ b/paludis/repositories/gems/yaml.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
@@ -389,3 +389,5 @@ ParseError::ParseError(const std::string & s) throw () :
{
}
+template class InstantiationPolicy<NodeManager, instantiation_method::SingletonTag>;
+
diff --git a/paludis/repositories/unpackaged/ndbam.cc b/paludis/repositories/unpackaged/ndbam.cc
index 2a2a738..f71fb4d 100644
--- a/paludis/repositories/unpackaged/ndbam.cc
+++ b/paludis/repositories/unpackaged/ndbam.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
@@ -264,6 +264,15 @@ NDBAM::has_package_named(const QualifiedPackageName & q)
return false;
}
+namespace
+{
+ template <typename T_>
+ T_ * desptr(const tr1::shared_ptr<T_> & p)
+ {
+ return p.get();
+ }
+}
+
tr1::shared_ptr<NDBAMEntrySequence>
NDBAM::entries(const QualifiedPackageName & q)
{
@@ -329,8 +338,8 @@ NDBAM::entries(const QualifiedPackageName & q)
using namespace tr1::placeholders;
pc.entries->sort(
tr1::bind(std::less<VersionSpec>(),
- tr1::bind<VersionSpec>(tr1::mem_fn(&NDBAMEntry::version), _1),
- tr1::bind<VersionSpec>(tr1::mem_fn(&NDBAMEntry::version), _2)
+ tr1::bind<VersionSpec>(tr1::mem_fn(&NDBAMEntry::version), tr1::bind(&desptr<const NDBAMEntry>, _1)),
+ tr1::bind<VersionSpec>(tr1::mem_fn(&NDBAMEntry::version), tr1::bind(&desptr<const NDBAMEntry>, _2))
));
}
diff --git a/paludis/use_requirements.cc b/paludis/use_requirements.cc
index fe36355..d2a235b 100644
--- a/paludis/use_requirements.cc
+++ b/paludis/use_requirements.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
@@ -78,12 +78,22 @@ UseRequirements::end() const
return ConstIterator(_imp->reqs.end());
}
+namespace
+{
+ template <typename T_>
+ T_ * desptr(const tr1::shared_ptr<T_> & p)
+ {
+ return p.get();
+ }
+}
+
UseRequirements::ConstIterator
UseRequirements::find(const UseFlagName & u) const
{
using namespace tr1::placeholders;
return ConstIterator(std::find_if(_imp->reqs.begin(), _imp->reqs.end(),
- tr1::bind(std::equal_to<UseFlagName>(), u, tr1::bind(tr1::mem_fn(&UseRequirement::flag), _1))));
+ tr1::bind(std::equal_to<UseFlagName>(), u, tr1::bind(tr1::mem_fn(&UseRequirement::flag),
+ tr1::bind(&desptr<const UseRequirement>, _1)))));
}
void
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");