aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-05-19 17:51:32 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-05-19 17:51:32 +0000
commit73d07f310a6def124f18575cffaeeb94da0c91a7 (patch)
tree149295a5afd92b2ccb3e874d41313011608a6b3b
parent90632c63787bf9fcf78e15b04cc33a060d3971c6 (diff)
downloadpaludis-73d07f310a6def124f18575cffaeeb94da0c91a7.tar.gz
paludis-73d07f310a6def124f18575cffaeeb94da0c91a7.tar.xz
More g++-4.3 fixes
-rw-r--r--paludis/args/args_TEST.cc1
-rw-r--r--paludis/dep_list/dep_list.cc1
-rw-r--r--paludis/dep_list/range_rewriter_TEST.cc2
-rw-r--r--paludis/qa/metadata_file_TEST.cc3
-rw-r--r--paludis/repositories/gems/cache.cc1
-rw-r--r--paludis/repositories/gems/yaml_TEST.cc3
-rw-r--r--paludis/tasks/install_task.cc1
-rw-r--r--paludis/tasks/report_task.cc1
-rw-r--r--paludis/tasks/uninstall_task.cc1
-rw-r--r--ruby/Makefile.am2
-rw-r--r--src/clients/adjutrix/display_profiles_use.cc1
-rw-r--r--src/clients/adjutrix/find_insecure_packages.cc1
-rw-r--r--src/clients/adjutrix/find_reverse_deps.cc1
-rw-r--r--src/clients/contrarius/stage.hh12
-rw-r--r--src/clients/inquisitio/do_search.cc1
-rw-r--r--src/clients/paludis/list.cc1
-rw-r--r--src/clients/paludis/owner.cc1
-rw-r--r--src/clients/paludis/uninstall.cc2
-rw-r--r--src/output/console_query_task.cc1
-rw-r--r--src/output/licence.cc1
20 files changed, 28 insertions, 10 deletions
diff --git a/paludis/args/args_TEST.cc b/paludis/args/args_TEST.cc
index d7c6de1..c2e46b1 100644
--- a/paludis/args/args_TEST.cc
+++ b/paludis/args/args_TEST.cc
@@ -21,6 +21,7 @@
#include <paludis/args/args_error.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
+#include <algorithm>
using namespace paludis;
using namespace paludis::args;
diff --git a/paludis/dep_list/dep_list.cc b/paludis/dep_list/dep_list.cc
index 4662704..21686a0 100644
--- a/paludis/dep_list/dep_list.cc
+++ b/paludis/dep_list/dep_list.cc
@@ -33,6 +33,7 @@
#include <paludis/util/save.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/tokeniser.hh>
+#include <paludis/util/visitor-impl.hh>
#include <algorithm>
#include <functional>
diff --git a/paludis/dep_list/range_rewriter_TEST.cc b/paludis/dep_list/range_rewriter_TEST.cc
index 650d085..36f8f77 100644
--- a/paludis/dep_list/range_rewriter_TEST.cc
+++ b/paludis/dep_list/range_rewriter_TEST.cc
@@ -25,6 +25,8 @@
#include <test/test_runner.hh>
#include <test/test_framework.hh>
+#include <algorithm>
+
using namespace test;
using namespace paludis;
diff --git a/paludis/qa/metadata_file_TEST.cc b/paludis/qa/metadata_file_TEST.cc
index 2d87221..658e4ef 100644
--- a/paludis/qa/metadata_file_TEST.cc
+++ b/paludis/qa/metadata_file_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaranm@ciaranm.org>
*
* 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
@@ -20,6 +20,7 @@
#include <paludis/qa/metadata_file.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
+#include <algorithm>
#include "config.h"
using namespace paludis;
diff --git a/paludis/repositories/gems/cache.cc b/paludis/repositories/gems/cache.cc
index 34bb33f..a36ad5e 100644
--- a/paludis/repositories/gems/cache.cc
+++ b/paludis/repositories/gems/cache.cc
@@ -24,6 +24,7 @@
#include <paludis/util/save.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/log.hh>
+#include <paludis/util/visitor-impl.hh>
#include <list>
#include <yaml.h>
diff --git a/paludis/repositories/gems/yaml_TEST.cc b/paludis/repositories/gems/yaml_TEST.cc
index 0d463f8..64005df 100644
--- a/paludis/repositories/gems/yaml_TEST.cc
+++ b/paludis/repositories/gems/yaml_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaranm@ciaranm.org>
*
* 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
@@ -20,6 +20,7 @@
#include <paludis/repositories/gems/yaml.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
+#include <algorithm>
using namespace test;
using namespace paludis;
diff --git a/paludis/tasks/install_task.cc b/paludis/tasks/install_task.cc
index 63a0eca..9ea1edc 100644
--- a/paludis/tasks/install_task.cc
+++ b/paludis/tasks/install_task.cc
@@ -27,6 +27,7 @@
#include <paludis/repository.hh>
#include <paludis/package_database.hh>
#include <paludis/tasks/exceptions.hh>
+#include <paludis/util/visitor-impl.hh>
#include <list>
using namespace paludis;
diff --git a/paludis/tasks/report_task.cc b/paludis/tasks/report_task.cc
index 91606b5..ad649e3 100644
--- a/paludis/tasks/report_task.cc
+++ b/paludis/tasks/report_task.cc
@@ -22,6 +22,7 @@
#include <paludis/dep_list/uninstall_list.hh>
#include <paludis/environment.hh>
#include <paludis/query.hh>
+#include <paludis/util/visitor-impl.hh>
#include <paludis/package_database.hh>
#include <set>
diff --git a/paludis/tasks/uninstall_task.cc b/paludis/tasks/uninstall_task.cc
index 73d41c0..1e321b2 100644
--- a/paludis/tasks/uninstall_task.cc
+++ b/paludis/tasks/uninstall_task.cc
@@ -23,6 +23,7 @@
#include <paludis/dep_spec_flattener.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/tasks/exceptions.hh>
+#include <paludis/util/visitor-impl.hh>
#include <paludis/query.hh>
#include <paludis/hook.hh>
#include <list>
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index d2357d1..b1ddd5f 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -99,7 +99,7 @@ TESTS_ENVIRONMENT = env \
\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/.libs\`: \
\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/.libs\`: \
\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/qa/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs\`" \
+ \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs\`:$$LD_LIBRARY_PATH" \
| tr -d ' '` \
bash $(top_srcdir)/test/run_test.sh "$(RUBY) -I ./.libs/"
diff --git a/src/clients/adjutrix/display_profiles_use.cc b/src/clients/adjutrix/display_profiles_use.cc
index c767861..7cee036 100644
--- a/src/clients/adjutrix/display_profiles_use.cc
+++ b/src/clients/adjutrix/display_profiles_use.cc
@@ -32,6 +32,7 @@
#include <iomanip>
#include <vector>
#include <cstdlib>
+#include <algorithm>
#include <set>
#include <map>
diff --git a/src/clients/adjutrix/find_insecure_packages.cc b/src/clients/adjutrix/find_insecure_packages.cc
index 138abe6..2c06ee5 100644
--- a/src/clients/adjutrix/find_insecure_packages.cc
+++ b/src/clients/adjutrix/find_insecure_packages.cc
@@ -24,6 +24,7 @@
#include <paludis/query.hh>
#include <paludis/dep_spec.hh>
#include <paludis/package_database.hh>
+#include <paludis/util/visitor-impl.hh>
#include <set>
#include <map>
diff --git a/src/clients/adjutrix/find_reverse_deps.cc b/src/clients/adjutrix/find_reverse_deps.cc
index 069db69..db65d29 100644
--- a/src/clients/adjutrix/find_reverse_deps.cc
+++ b/src/clients/adjutrix/find_reverse_deps.cc
@@ -24,6 +24,7 @@
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/save.hh>
#include <paludis/util/log.hh>
+#include <paludis/util/visitor-impl.hh>
#include <paludis/query.hh>
#include <paludis/dep_spec.hh>
#include <paludis/package_database.hh>
diff --git a/src/clients/contrarius/stage.hh b/src/clients/contrarius/stage.hh
index 75df029..722cd59 100644
--- a/src/clients/contrarius/stage.hh
+++ b/src/clients/contrarius/stage.hh
@@ -84,7 +84,7 @@ namespace paludis
virtual std::string description() const
{
return "Building the GNU binutils as part of the cross toolchain";
- };
+ }
virtual bool is_rebuild() const;
@@ -108,7 +108,7 @@ namespace paludis
virtual std::string description() const
{
return "Building the kernel headers as part of the cross toolchain";
- };
+ }
virtual bool is_rebuild() const;
@@ -132,7 +132,7 @@ namespace paludis
virtual std::string description() const
{
return "Building a minimal GNU C compiler as part of the cross toolchain";
- };
+ }
virtual bool is_rebuild() const;
@@ -156,7 +156,7 @@ namespace paludis
virtual std::string description() const
{
return "Building the C standard library headers as part of the cross toolchain";
- };
+ }
virtual bool is_rebuild() const;
@@ -180,7 +180,7 @@ namespace paludis
virtual std::string description() const
{
return "Building the C standard library as part of the cross toolchain";
- };
+ }
virtual bool is_rebuild() const;
@@ -205,7 +205,7 @@ namespace paludis
virtual std::string description() const
{
return "Building the full GNU compiler collection as part of the cross toolchain";
- };
+ }
virtual bool is_rebuild() const;
diff --git a/src/clients/inquisitio/do_search.cc b/src/clients/inquisitio/do_search.cc
index cf8576b..ff4624b 100644
--- a/src/clients/inquisitio/do_search.cc
+++ b/src/clients/inquisitio/do_search.cc
@@ -30,6 +30,7 @@
#include <list>
#include <set>
#include <iostream>
+#include <algorithm>
using namespace paludis;
using namespace inquisitio;
diff --git a/src/clients/paludis/list.cc b/src/clients/paludis/list.cc
index b3d49a7..20408ad 100644
--- a/src/clients/paludis/list.cc
+++ b/src/clients/paludis/list.cc
@@ -31,6 +31,7 @@
#include <iostream>
#include <list>
#include <map>
+#include <algorithm>
using namespace paludis;
diff --git a/src/clients/paludis/owner.cc b/src/clients/paludis/owner.cc
index cf99045..ac95ab6 100644
--- a/src/clients/paludis/owner.cc
+++ b/src/clients/paludis/owner.cc
@@ -22,6 +22,7 @@
#include "command_line.hh"
#include <paludis/paludis.hh>
#include <iostream>
+#include <algorithm>
using namespace paludis;
using std::cout;
diff --git a/src/clients/paludis/uninstall.cc b/src/clients/paludis/uninstall.cc
index a0794ca..81b60c7 100644
--- a/src/clients/paludis/uninstall.cc
+++ b/src/clients/paludis/uninstall.cc
@@ -52,7 +52,7 @@ namespace
_count(0),
_current_count(0)
{
- };
+ }
virtual void on_build_unmergelist_pre()
{
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index d5ed361..a45eed7 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -22,6 +22,7 @@
#include "use_flag_pretty_printer.hh"
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/tokeniser.hh>
+#include <paludis/util/visitor-impl.hh>
#include <paludis/query.hh>
#include <list>
diff --git a/src/output/licence.cc b/src/output/licence.cc
index 08f4d4a..297673e 100644
--- a/src/output/licence.cc
+++ b/src/output/licence.cc
@@ -20,6 +20,7 @@
#include "licence.hh"
#include "colour.hh"
#include <ostream>
+#include <algorithm>
void
LicenceDisplayer::visit(const paludis::AllDepSpec * spec)