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

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

diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index 9588d30a57a58be117559899af3b874c7b8626d4..a2d7b321b18abcf61b4489f4a98f3bf69aa2e087 100644 (file)
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -38,7 +38,7 @@ class pkgOrderList : protected pkgCache::Namespace
    Package **End;
    Package **List;
    Package **AfterEnd;
    Package **End;
    Package **List;
    Package **AfterEnd;

-   string *FileList;
+   std::string *FileList;

    DepIterator Loops[20];
    int LoopCount;
    int Depth;
    DepIterator Loops[20];
    int LoopCount;
    int Depth;


@@ -102,7 +102,7 @@ class pkgOrderList : protected pkgCache::Namespace
    inline bool IsNow(PkgIterator Pkg) {return (Flags[Pkg->ID] & (States & (~Removed))) == 0;};
    bool IsMissing(PkgIterator Pkg);
    void WipeFlags(unsigned long F);
    inline bool IsNow(PkgIterator Pkg) {return (Flags[Pkg->ID] & (States & (~Removed))) == 0;};
    bool IsMissing(PkgIterator Pkg);
    void WipeFlags(unsigned long F);

-   void SetFileList(string *FileList) {this->FileList = FileList;};
+   void SetFileList(std::string *FileList) {this->FileList = FileList;};

 
    // Accessors
    inline iterator begin() {return List;};
 
    // Accessors
    inline iterator begin() {return List;};


@@ -115,7 +115,7 @@ class pkgOrderList : protected pkgCache::Namespace
    
    // Ordering modes
    bool OrderCritical();
    
    // Ordering modes
    bool OrderCritical();

-   bool OrderUnpack(string *FileList = 0);
+   bool OrderUnpack(std::string *FileList = 0);

    bool OrderConfigure();
 
    int Score(PkgIterator Pkg);
    bool OrderConfigure();
 
    int Score(PkgIterator Pkg);