aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-08 08:39:55 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-08 08:39:55 +0000
commit86949f83af7cec8011009563c782e009072eb213 (patch)
treecc298504668dc8870d2b8012c4ce93218fa9971a
parentaa29b604af65f404c1d884c9df09c799919f60c7 (diff)
downloadpaludis-86949f83af7cec8011009563c782e009072eb213.tar.gz
paludis-86949f83af7cec8011009563c782e009072eb213.tar.xz
Compile fixes for gcc-3.4, gcc-4.2
-rw-r--r--src/clients/paludis/do_config.cc4
-rw-r--r--src/output/console_query_task.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/clients/paludis/do_config.cc b/src/clients/paludis/do_config.cc
index 99be418..79b6e2e 100644
--- a/src/clients/paludis/do_config.cc
+++ b/src/clients/paludis/do_config.cc
@@ -41,6 +41,10 @@ namespace
matches(m)
{
}
+
+ ~AmbiguousConfigTarget() throw ()
+ {
+ }
};
int
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index f18127b..98a1e82 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -304,7 +304,7 @@ namespace
}
};
- bool is_empty(std::tr1::shared_ptr<const DepAtom> d)
+ bool is_atom_empty(std::tr1::shared_ptr<const DepAtom> d)
{
IsEmpty e;
d->accept(&e);
@@ -316,7 +316,7 @@ void
ConsoleQueryTask::display_metadata_dep(const std::string & k, const std::string & kk,
std::tr1::shared_ptr<const DepAtom> d, const bool one_line) const
{
- if (is_empty(d))
+ if (is_atom_empty(d))
return;
output_left_column((want_raw() ? kk : k) + ":");