aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-07-12 00:57:13 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-07-12 00:57:13 +0100
commit8047560bebebde0cc6ca96ef473996dad9a22a57 (patch)
treee906b918ec41788feec28d6c3888a5ac4f701d59
parent49040ebf8ba3561c0e5e80fcafb07f08a4cfe0a6 (diff)
downloadpaludis-8047560bebebde0cc6ca96ef473996dad9a22a57.tar.gz
paludis-8047560bebebde0cc6ca96ef473996dad9a22a57.tar.xz
Silence some 4.4 warnings
-rw-r--r--paludis/choice.cc8
-rw-r--r--paludis/choice.hh8
-rw-r--r--paludis/create_output_manager_info.cc4
-rw-r--r--paludis/create_output_manager_info.hh4
-rw-r--r--ruby/choice.cc4
5 files changed, 14 insertions, 14 deletions
diff --git a/paludis/choice.cc b/paludis/choice.cc
index 85a4cb1..84f57ef 100644
--- a/paludis/choice.cc
+++ b/paludis/choice.cc
@@ -240,25 +240,25 @@ Choice::human_name() const
return _imp->params.human_name();
}
-const bool
+bool
Choice::contains_every_value() const
{
return _imp->params.contains_every_value();
}
-const bool
+bool
Choice::hidden() const
{
return _imp->params.hidden();
}
-const bool
+bool
Choice::show_with_no_prefix() const
{
return _imp->params.show_with_no_prefix();
}
-const bool
+bool
Choice::consider_added_or_changed() const
{
return _imp->params.consider_added_or_changed();
diff --git a/paludis/choice.hh b/paludis/choice.hh
index ce6522c..1aa24d6 100644
--- a/paludis/choice.hh
+++ b/paludis/choice.hh
@@ -276,12 +276,12 @@ namespace paludis
* For pesky 0-based EAPIs that don't require things like userland_GNU in IUSE, and that
* don't have a comprehensive list of possible values.
*/
- const bool contains_every_value() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ bool contains_every_value() const PALUDIS_ATTRIBUTE((warn_unused_result));
/**
* If true, this option should not usually be shown visually to a user.
*/
- const bool hidden() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ bool hidden() const PALUDIS_ATTRIBUTE((warn_unused_result));
/**
* If true, hint that we're better not displaying our prefix to the user.
@@ -289,7 +289,7 @@ namespace paludis
* This is used by --pretend --install and --query to avoid showing a Use:
* prefix before a list of use flag names.
*/
- const bool show_with_no_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ bool show_with_no_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result));
/**
* If false, do not consider flags in this section for 'added' or 'changed'
@@ -297,7 +297,7 @@ namespace paludis
*
* Used by build_options.
*/
- const bool consider_added_or_changed() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ bool consider_added_or_changed() const PALUDIS_ATTRIBUTE((warn_unused_result));
///\}
diff --git a/paludis/create_output_manager_info.cc b/paludis/create_output_manager_info.cc
index 7717085..f784742 100644
--- a/paludis/create_output_manager_info.cc
+++ b/paludis/create_output_manager_info.cc
@@ -84,7 +84,7 @@ CreateOutputManagerForPackageIDActionInfo::action() const
return _imp->action;
}
-const OutputExclusivity
+OutputExclusivity
CreateOutputManagerForPackageIDActionInfo::output_exclusivity() const
{
return _imp->output_exclusivity;
@@ -107,7 +107,7 @@ CreateOutputManagerForRepositorySyncInfo::repository() const
return _imp->repo;
}
-const OutputExclusivity
+OutputExclusivity
CreateOutputManagerForRepositorySyncInfo::output_exclusivity() const
{
return _imp->output_exclusivity;
diff --git a/paludis/create_output_manager_info.hh b/paludis/create_output_manager_info.hh
index 4ce3f7d..99d3619 100644
--- a/paludis/create_output_manager_info.hh
+++ b/paludis/create_output_manager_info.hh
@@ -69,7 +69,7 @@ namespace paludis
const std::tr1::shared_ptr<const PackageID> package_id() const PALUDIS_ATTRIBUTE((warn_unused_result));
const Action & action() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const OutputExclusivity output_exclusivity() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ OutputExclusivity output_exclusivity() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
/**
@@ -93,7 +93,7 @@ namespace paludis
~CreateOutputManagerForRepositorySyncInfo();
const Repository & repository() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const OutputExclusivity output_exclusivity() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ OutputExclusivity output_exclusivity() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/ruby/choice.cc b/ruby/choice.cc
index 2f80cf8..c203e26 100644
--- a/ruby/choice.cc
+++ b/ruby/choice.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 2009 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
@@ -213,7 +213,7 @@ namespace
*/
FAKE_RDOC_METHOD(choice_consider_added_or_changed)
- template <typename R_, const R_ (Choice::* r_) () const>
+ template <typename R_, R_ (Choice::* r_) () const>
struct ChoiceBoolishMembers
{
static VALUE fetch(VALUE self_v)