fix the remaining lzma calls with xz --format=lzma in the testcases

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index f299f8189e7d6cc040409cdfc6764fa3f9d689e9..37eacf1f8d77b94b7fbcdb8ef8ecf1c53c73ba03 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -33,10 +33,16 @@
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>

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

 
 #include <iostream>
 
 
 #include <iostream>
 

+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/acquire.h>
+using std::ostream;
+#endif
+
+class pkgAcquireStatus;
+

 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {
    protected:
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {
    protected:


@@ -90,7 +96,7 @@ class pkgProblemResolver                                              /*{{{*/
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
                Upgradable = (1 << 2), ReInstateTried = (1 << 3),
                ToRemove = (1 << 4)};
    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;
    
    unsigned char *Flags;
    bool Debug;