diff options
| author | Daniel Burrows <dburrows@debian.org> | 2010-01-31 11:40:12 -0800 |
|---|---|---|
| committer | Daniel Burrows <dburrows@debian.org> | 2010-01-31 11:40:12 -0800 |
| commit | c7e55574c8750a273cbf4e45eabc923aeb716cd7 (patch) | |
| tree | 2c91b8c798355e385f3b87766916064e69f1e0c3 /src/generic/problemresolver | |
| parent | 50876fffca7348618008955e56e1ea9e003fc17c (diff) | |
| download | aptitude-c7e55574c8750a273cbf4e45eabc923aeb716cd7.tar.gz | |
The greatest lower bound should discard trailing user levels.
Diffstat (limited to 'src/generic/problemresolver')
| -rw-r--r-- | src/generic/problemresolver/tier_operation.cc | 7 | ||||
| -rw-r--r-- | src/generic/problemresolver/tier_operation.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/generic/problemresolver/tier_operation.cc b/src/generic/problemresolver/tier_operation.cc index 3cc0de23..25906433 100644 --- a/src/generic/problemresolver/tier_operation.cc +++ b/src/generic/problemresolver/tier_operation.cc @@ -84,13 +84,6 @@ tier tier_operation::levelwise_minimum(const tier &t1, const tier &t2) ++it2; } - if(it1 != end1) - out_user_levels.insert(out_user_levels.end(), - it1, end1); - else if(it2 != end2) - out_user_levels.insert(out_user_levels.end(), - it2, end2); - return tier(out_structural_level, out_user_levels.begin(), out_user_levels.end()); diff --git a/src/generic/problemresolver/tier_operation.h b/src/generic/problemresolver/tier_operation.h index 22c63d51..92bd74f7 100644 --- a/src/generic/problemresolver/tier_operation.h +++ b/src/generic/problemresolver/tier_operation.h @@ -86,7 +86,7 @@ class tier_operation * of the corresponding entries in the input tiers. Unpaired * levels (in the event that one of the tiers is longer than the * other) are assumed to equal tier_limits::maximum_level, with the - * effect that the longer tier's elements are copied unchanged. + * effect that the longer tier's elements are discarded. * * This function is implemented here instead of in tier.h because * tier operations require exactly this behavior and nothing else |