aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-11 14:18:31 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-11 14:18:31 +0000
commit28a771a53b1c3aef0ce1c222e1594cb228c15864 (patch)
treeb7b3ed084eb46297b90a5b9939629497902a4de9
parent62b7f8386ba1ced15356f79b32715fe92e3d4698 (diff)
downloadpaludis-28a771a53b1c3aef0ce1c222e1594cb228c15864.tar.gz
paludis-28a771a53b1c3aef0ce1c222e1594cb228c15864.tar.xz
Clean up some compiler warnings for contrarius
-rw-r--r--src/clients/contrarius/Makefile.am3
-rw-r--r--src/clients/contrarius/stage.cc2
-rw-r--r--src/clients/contrarius/target_config.cc2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/clients/contrarius/Makefile.am b/src/clients/contrarius/Makefile.am
index 9793e56..04ef28a 100644
--- a/src/clients/contrarius/Makefile.am
+++ b/src/clients/contrarius/Makefile.am
@@ -1,4 +1,5 @@
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@
+AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
+ @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@
DEFS= \
-DDATADIR=\"$(datadir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/src/clients/contrarius/stage.cc b/src/clients/contrarius/stage.cc
index 7f76ef7..0c42697 100644
--- a/src/clients/contrarius/stage.cc
+++ b/src/clients/contrarius/stage.cc
@@ -48,7 +48,7 @@ AuxiliaryStage::is_rebuild() const
for (std::list<std::string>::const_iterator p(packages.begin()), p_end(packages.end()) ;
p != p_end ; ++p)
if ( _env->package_database()->query(
- query::Matches(PackageDepSpec(*p)) &
+ query::Matches(PackageDepSpec(*p, pds_pm_permissive)) &
query::InstalledAtRoot(_env->root()),
qo_whatever)->empty())
return false;
diff --git a/src/clients/contrarius/target_config.cc b/src/clients/contrarius/target_config.cc
index 03441a1..a3c578d 100644
--- a/src/clients/contrarius/target_config.cc
+++ b/src/clients/contrarius/target_config.cc
@@ -38,7 +38,7 @@ TargetConfig::_parse_defaults()
for (LineConfigFile::Iterator l(defaults.begin()), l_end(defaults.end()) ;
l != l_end ; ++l)
{
- Context c("While parsing line '" + *l + "'");
+ Context c2("While parsing line '" + *l + "'");
std::vector<std::string> tokens;
WhitespaceTokeniser::get_instance()->tokenise(*l, std::back_inserter(tokens));
SpecEntryList * list(&_binutils_list);