diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:54:22 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:54:22 +0000 |
| commit | 727f18afe9c2eec15ee446cb667d9561644b5bf6 (patch) | |
| tree | 7b8f7e3cd17bd725d4c47e22384400c002ca3982 /apt-pkg/orderlist.cc | |
| parent | 140fd43fa632739af061834a6c1b7ee0f73a35b7 (diff) | |
Daniel Jacobowitz's gcc 2.95 C++ patch
Author: jgg
Date: 1999-07-20 05:53:32 GMT
Daniel Jacobowitz's gcc 2.95 C++ patch
Diffstat (limited to 'apt-pkg/orderlist.cc')
| -rw-r--r-- | apt-pkg/orderlist.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index cb52d160e..0d529c122 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: orderlist.cc,v 1.7 1999/07/19 01:49:44 jgg Exp $ +// $Id: orderlist.cc,v 1.8 1999/07/20 05:53:33 jgg Exp $ /* ###################################################################### Order List - Represents and Manipulates an ordered list of packages. @@ -150,7 +150,7 @@ bool pkgOrderList::OrderCritical() { FileList = 0; - Primary = &DepUnPackPre; + Primary = &pkgOrderList::DepUnPackPre; Secondary = 0; RevDepends = 0; Remove = 0; @@ -176,10 +176,10 @@ bool pkgOrderList::OrderUnpack(string *FileList) { this->FileList = FileList; - Primary = &DepUnPackCrit; - Secondary = &DepConfigure; - RevDepends = &DepUnPackDep; - Remove = &DepRemove; + Primary = &pkgOrderList::DepUnPackCrit; + Secondary = &pkgOrderList::DepConfigure; + RevDepends = &pkgOrderList::DepUnPackDep; + Remove = &pkgOrderList::DepRemove; LoopCount = -1; // Sort @@ -200,7 +200,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) return false; LoopCount = 0; - Primary = &DepUnPackPre; + Primary = &pkgOrderList::DepUnPackPre; if (DoRun() == false) return false; @@ -222,7 +222,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) bool pkgOrderList::OrderConfigure() { FileList = 0; - Primary = &DepConfigure; + Primary = &pkgOrderList::DepConfigure; Secondary = 0; RevDepends = 0; Remove = 0; @@ -475,8 +475,8 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg) DepFunc Old = Primary; // Perform immedate configuration of the package if so flagged. - if (IsFlag(Pkg,Immediate) == true && Primary != &DepUnPackPre) - Primary = &DepUnPackPreD; + if (IsFlag(Pkg,Immediate) == true && Primary != &pkgOrderList::DepUnPackPre) + Primary = &pkgOrderList::DepUnPackPreD; if (IsNow(Pkg) == true) { @@ -589,7 +589,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D) DepFunc Old = Primary; bool Res = false; if (D->Type == pkgCache::Dep::PreDepends) - Primary = &DepUnPackPreD; + Primary = &pkgOrderList::DepUnPackPreD; Res = VisitProvides(D,true); Primary = Old; if (Res == false) |