retitle FTBFS with g++ 4.7 thanks More new warnings in g++ 4.7, fixes are attached.
Regards, Adrian
From f14a272b49a6f4b5c7a68b20c93c0894c267ec0c Mon Sep 17 00:00:00 2001
From: Adrian Lang <m...@adrianlang.de>
Date: Thu, 10 May 2012 16:58:16 +0200
Subject: [PATCH] Fix build with g++ 4.7
---
src/generic/apt/aptitude_resolver.h | 2 ++
src/generic/problemresolver/incremental_expression.h | 2 +-
src/generic/util/dynamic_list_collection.h | 6 +++---
src/generic/util/dynamic_list_impl.h | 6 +++---
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/generic/apt/aptitude_resolver.h b/src/generic/apt/aptitude_resolver.h
index f2fa566..6270d80 100644
--- a/src/generic/apt/aptitude_resolver.h
+++ b/src/generic/apt/aptitude_resolver.h
@@ -450,6 +450,8 @@ public:
aptitudeDepCache *cache,
pkgPolicy *_policy);
+ virtual ~aptitude_resolver() {}
+
/** \brief Return \b true if the given version will break a hold or
* install a forbidden version.
*/
diff --git a/src/generic/problemresolver/incremental_expression.h b/src/generic/problemresolver/incremental_expression.h
index da23520..81334ae 100644
--- a/src/generic/problemresolver/incremental_expression.h
+++ b/src/generic/problemresolver/incremental_expression.h
@@ -533,7 +533,7 @@ public:
{
T old_value = value;
value = new_value;
- signal_value_changed(old_value, new_value);
+ this->signal_value_changed(old_value, new_value);
}
}
diff --git a/src/generic/util/dynamic_list_collection.h b/src/generic/util/dynamic_list_collection.h
index 5539369..50ecc48 100644
--- a/src/generic/util/dynamic_list_collection.h
+++ b/src/generic/util/dynamic_list_collection.h
@@ -254,7 +254,7 @@ namespace aptitude
const std::size_t insert_idx = insert_location - concrete_view.begin();
concrete_view.insert(insert_location, cell(list, idx, value));
- signal_inserted(value, insert_idx);
+ this->signal_inserted(value, insert_idx);
}
template<typename T>
@@ -316,7 +316,7 @@ namespace aptitude
// removal BEFORE removing it!
const std::size_t remove_idx = remove_location - concrete_view.begin();
concrete_view.erase(remove_location);
- signal_removed(value, remove_idx);
+ this->signal_removed(value, remove_idx);
}
}
@@ -412,7 +412,7 @@ namespace aptitude
relocate_target = to_location;
concrete_view.relocate(relocate_target, from_location);
- signal_moved(value, from_idx, to_idx);
+ this->signal_moved(value, from_idx, to_idx);
}
template<typename T>
diff --git a/src/generic/util/dynamic_list_impl.h b/src/generic/util/dynamic_list_impl.h
index 6b0b8bc..90edc0f 100644
--- a/src/generic/util/dynamic_list_impl.h
+++ b/src/generic/util/dynamic_list_impl.h
@@ -91,7 +91,7 @@ namespace aptitude
void dynamic_list_impl<T>::insert(const T &t, std::size_t position)
{
entries.insert(entries.begin() + position, t);
- signal_inserted(t, position);
+ this->signal_inserted(t, position);
}
template<typename T>
@@ -99,7 +99,7 @@ namespace aptitude
{
T val = entries[position];
entries.erase(entries.begin() + position);
- signal_removed(val, position);
+ this->signal_removed(val, position);
}
template<typename T>
@@ -129,7 +129,7 @@ namespace aptitude
const std::size_t idx_to_delete = to < from ? from + 1 : from;
entries.erase(entries.begin() + idx_to_delete);
- signal_moved(val, from, to);
+ this->signal_moved(val, from, to);
}
}
}
--
1.7.10
signature.asc
Description: PGP signature
