diff options
author | Adrian Lang <mail@adrianlang.de> | 2012-05-10 16:58:16 +0200 |
---|---|---|
committer | Daniel Hartwig <mandyke@gmail.com> | 2012-05-11 21:37:42 +0800 |
commit | 6e742788bb45c890063980813baa58be7c0e1670 (patch) | |
tree | 03f3bb401535be6353ba63766a3fc5f632ec72b8 /src | |
parent | 59d734c9028463c8b436851960195f8c69ef0693 (diff) | |
download | aptitude-6e742788bb45c890063980813baa58be7c0e1670.tar.gz |
Fix build with g++ 4.7
Diffstat (limited to 'src')
-rw-r--r-- | src/generic/apt/aptitude_resolver.h | 2 | ||||
-rw-r--r-- | src/generic/problemresolver/incremental_expression.h | 2 | ||||
-rw-r--r-- | src/generic/util/dynamic_list_collection.h | 6 | ||||
-rw-r--r-- | 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 f2fa566a..6270d801 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 da235208..81334aeb 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 55393695..50ecc48b 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 6b0b8bcb..90edc0f6 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); } } } |