* apt-pkg/depcache.cc:

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

diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index 4e5ea16542e3186cee5b690fee3dd9202a08e227..a2d7b321b18abcf61b4489f4a98f3bf69aa2e087 100644 (file)
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -18,6 +18,7 @@
 
 
 #include <apt-pkg/pkgcache.h>
 
 
 #include <apt-pkg/pkgcache.h>

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

 
 class pkgDepCache;
 class pkgOrderList : protected pkgCache::Namespace
 
 class pkgDepCache;
 class pkgOrderList : protected pkgCache::Namespace


@@ -37,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;


@@ -45,7 +46,8 @@ class pkgOrderList : protected pkgCache::Namespace
    bool Debug;
    
    // Main visit function
    bool Debug;
    
    // Main visit function

-   bool VisitNode(PkgIterator Pkg);
+   __deprecated bool VisitNode(PkgIterator Pkg) { return VisitNode(Pkg, "UNKNOWN"); };
+   bool VisitNode(PkgIterator Pkg, char const* from);

    bool VisitDeps(DepFunc F,PkgIterator Pkg);
    bool VisitRDeps(DepFunc F,PkgIterator Pkg);
    bool VisitRProvides(DepFunc F,VerIterator Ver);
    bool VisitDeps(DepFunc F,PkgIterator Pkg);
    bool VisitRDeps(DepFunc F,PkgIterator Pkg);
    bool VisitRProvides(DepFunc F,VerIterator Ver);


@@ -100,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;};


@@ -113,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);