Fix compile with icc 10.1

4 files changed, 6 insertions, 17 deletions

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"));