Merge remote-tracking branch 'mvo/bugfix/bts-712433' into debian/sid

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 948fe110312689e06d05130a5e1e849a388d5692..7f58c8eedb12ce281d8af8df120eeda3be6d3013 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -36,6 +36,13 @@
 
 #include <iostream>
 
+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/acquire.h>
+using std::ostream;
+#endif
+
 class pkgAcquireStatus;
 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
@@ -73,6 +80,7 @@ private:
    public:
 
    pkgSimulate(pkgDepCache *Cache);
+   ~pkgSimulate();
 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
@@ -91,7 +99,7 @@ class pkgProblemResolver                                              /*{{{*/
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
                Upgradable = (1 << 2), ReInstateTried = (1 << 3),
                ToRemove = (1 << 4)};
-   signed short *Scores;
+   int *Scores;
    unsigned char *Flags;
    bool Debug;
    
@@ -126,9 +134,8 @@ class pkgProblemResolver                                            /*{{{*/
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 
-   // Install all protected packages   
-   void InstallProtect();   
-   
+   __deprecated void InstallProtect();
+
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 };
@@ -142,5 +149,7 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 
 bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);
-                    
+bool AcquireUpdate(pkgAcquire &Fetcher, int const PulseInterval = 0,
+                  bool const RunUpdateScripts = true, bool const ListCleanup = true);
+
 #endif