← Back to branch summary

~ubuntu-branches/debian/stretch/aptitude/stretch

« back to all changes in this revision

Viewing changes to src/generic/apt/resolver_manager.cc

  • Committer: Package Import Robot
  • Author(s): Andreas Barth
  • Date: 2013-08-16 13:19:40 UTC
  • Revision ID: package-import@ubuntu.com-20130816131940-qpv81q44y1ss5ger
Tags: 0.6.8.2-1.1
http://bugs.debian.org/708812
http://bugs.debian.org/714186
* cherrypick from git:
  + 794b91 fix FTBFS with g++-4.8
  + c142a7 task_list is not extern
* re-upload to unstable to have again a working package on mips*.
  Closes: #708812, #714186

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/generic/apt/resolver_manager.cc
384
384
 
385
385
        typedef generic_choice_set<aptitude_universe> choice_set;
386
386
        typedef generic_choice<aptitude_universe> choice;
387
 
        typedef aptitude_resolver_package package;
 
387
        // typedef aptitude_resolver_package package;
388
388
        typedef aptitude_resolver_version version;
389
389
        typedef aptitude_resolver_dep dep;
390
390
        const choice_set &choices = sol.get_choices();