test/integration/test-ubuntu-bug-346386-apt-get-update-paywall: use downloadfile()

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 5a9a77415e2764b04a43e9e725d00c892ec05f5b..f35bd9a133840b02a7835fc164a317b08d1166ec 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -10,7 +10,7 @@
    see all of the effects of an upgrade run.
 
    pkgDistUpgrade computes an upgrade that causes as many packages as
    see all of the effects of an upgrade run.
 
    pkgDistUpgrade computes an upgrade that causes as many packages as

-   possible to move to the newest verison.
+   possible to move to the newest version.

    
    pkgApplyStatus sets the target state based on the content of the status
    field in the status file. It is important to get proper crash recovery.
    
    pkgApplyStatus sets the target state based on the content of the status
    field in the status file. It is important to get proper crash recovery.


@@ -33,8 +33,11 @@
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>

+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>

 
 #include <iostream>
 
 #include <iostream>

+#include <string>

 
 #include <apt-pkg/macros.h>
 
 
 #include <apt-pkg/macros.h>
 


@@ -44,7 +47,7 @@ using std::ostream;
 #endif
 
 #ifndef APT_9_CLEANER_HEADERS
 #endif
 
 #ifndef APT_9_CLEANER_HEADERS

-// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatiblity
+// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatibility

 #include <apt-pkg/upgrade.h>
 #include <apt-pkg/update.h>
 #endif
 #include <apt-pkg/upgrade.h>
 #include <apt-pkg/update.h>
 #endif


@@ -111,7 +114,7 @@ class pkgProblemResolver                                            /*{{{*/
    
    // Sort stuff
    static pkgProblemResolver *This;
    
    // Sort stuff
    static pkgProblemResolver *This;

-   static int ScoreSort(const void *a,const void *b);
+   static int ScoreSort(const void *a,const void *b) APT_PURE;

 
    struct PackageKill
    {
 
    struct PackageKill
    {


@@ -140,7 +143,7 @@ class pkgProblemResolver                                            /*{{{*/
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 

-   __deprecated void InstallProtect();
+   APT_DEPRECATED void InstallProtect();

 
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();