diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-05-27 17:07:42 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-05-27 17:07:42 +0000 |
| commit | adb67fa7abf9eb30d312fdd3284f9d86a2899cb2 (patch) | |
| tree | 7468910a64753037887371777919c5bc24a26f37 /apt-pkg/solver3.h | |
| parent | 88adaff17023b0c916fc3227dc25d0b95128d7f0 (diff) | |
| parent | 86c44166b470ecee5a192ffb434fb7931b7c0afd (diff) | |
Merge branch 'solver3' into 'main'
solver3: Merge intersecting dependencies
See merge request apt-team/apt!485
Diffstat (limited to 'apt-pkg/solver3.h')
| -rw-r--r-- | apt-pkg/solver3.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/solver3.h b/apt-pkg/solver3.h index 590b187cc..a333d684a 100644 --- a/apt-pkg/solver3.h +++ b/apt-pkg/solver3.h @@ -404,9 +404,12 @@ struct APT::Solver::Clause // \brief A negative clause negates the solutions, that is X->A|B you get X->!(A|B), aka X->!A&!B bool negative; + // Clauses merged with this clause + std::forward_list<Clause> merged; + inline Clause(Var reason, Group group, bool optional = false, bool negative = false) : reason(reason), group(group), optional(optional), negative(negative) {} - std::string toString(pkgCache &cache, bool pretty = false) const; + std::string toString(pkgCache &cache, bool pretty = false, bool showMerged = true) const; }; /** |