Fix compile with icc 10.1

18 files changed, 60 insertions, 48 deletions

diff --git a/paludis/args/man.cc b/paludis/args/man.cc
index adbc09b80..a4163b1b6 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 6ef2ab0b4..7735871fb 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 107390a40..b7f67fe19 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 cc4d1968a..2e7227b30 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 9517cedeb..9db72bcae 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 453102d98..c31e97891 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 02f85d58a..f5aa6439b 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 a955bdda8..822fedb52 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 68c83b3c6..edced01ff 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 ffda9b800..f498ff853 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 15060bf68..c9ea0a6a6 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 b37a820a8..94bd8c44e 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 26b86e3a5..2a8bab6c2 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 a8d2c841b..a8a91b92d 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 15cb48ffb..9210212b9 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 c7c0c6359..3c64c1b39 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 2a2a73862..f71fb4d05 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 fe3635524..d2a235beb 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