implement generic config fallback for methods

[apt.git] / apt-pkg / algorithms.h

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 5b0d8fb2997ed29c01c85976517c0bbfaa0a20bf..c1a26587dcc994bf16a5566f84a4a9cadec6726a 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -124,9 +124,6 @@ class pkgProblemResolver                                            /*{{{*/
    APT_HIDDEN void MakeScores();
    APT_HIDDEN bool DoUpgrade(pkgCache::PkgIterator Pkg);
 
    APT_HIDDEN void MakeScores();
    APT_HIDDEN bool DoUpgrade(pkgCache::PkgIterator Pkg);
 

-   APT_HIDDEN bool ResolveInternal(bool const BrokenFix = false);
-   APT_HIDDEN bool ResolveByKeepInternal();
-

    protected:
    bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
 
    protected:
    bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
 


@@ -138,9 +135,11 @@ class pkgProblemResolver                                           /*{{{*/
 
    // Try to intelligently resolve problems by installing and removing packages
    bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL);
 
    // Try to intelligently resolve problems by installing and removing packages
    bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL);

+   APT_HIDDEN bool ResolveInternal(bool const BrokenFix = false);

 
    // Try to resolve problems only by using keep
    bool ResolveByKeep(OpProgress * const Progress = NULL);
 
    // Try to resolve problems only by using keep
    bool ResolveByKeep(OpProgress * const Progress = NULL);

+   APT_HIDDEN bool ResolveByKeepInternal();

 
    APT_DEPRECATED_MSG("NOOP as MarkInstall enforces not overriding FromUser markings") void InstallProtect();
 
 
    APT_DEPRECATED_MSG("NOOP as MarkInstall enforces not overriding FromUser markings") void InstallProtect();