diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:11 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:11 +0000 |
| commit | 1825554677c23fbf3e6ae36264ac093fd15554db (patch) | |
| tree | 1d17ee2e78c7456627ae093ec084f9d0f13cd89f | |
| parent | d4887f3c78c2e12c074551003e88dfc609cc6b5a (diff) | |
G++3 fixes from Randolph
Author: jgg
Date: 2001-05-27 23:45:39 GMT
G++3 fixes from Randolph
| -rw-r--r-- | apt-inst/contrib/extracttar.cc | 3 | ||||
| -rw-r--r-- | apt-inst/deb/dpkgdb.cc | 4 | ||||
| -rw-r--r-- | apt-inst/extract.cc | 7 | ||||
| -rw-r--r-- | apt-inst/filelist.cc | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 57e083b5a..f8bd109ce 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: extracttar.cc,v 1.2 2001/02/20 07:03:17 jgg Exp $ +// $Id: extracttar.cc,v 1.3 2001/05/27 23:47:09 jgg Exp $ /* ###################################################################### Extract a Tar - Tar Extractor @@ -30,6 +30,7 @@ #include <unistd.h> #include <signal.h> #include <fcntl.h> +#include <iostream.h> /*}}}*/ // The on disk header for a tar file. diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index 85fec1ccd..532ca232a 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: dpkgdb.cc,v 1.2 2001/02/20 07:03:17 jgg Exp $ +// $Id: dpkgdb.cc,v 1.3 2001/05/27 23:46:28 jgg Exp $ /* ###################################################################### DPKGv1 Database Implemenation @@ -30,6 +30,8 @@ #include <sys/mman.h> #include <fcntl.h> #include <unistd.h> +#include <ctype.h> +#include <iostream.h> /*}}}*/ // EraseDir - Erase A Directory /*{{{*/ diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index a3c06c088..5c5ad55b2 100644 --- a/apt-inst/extract.cc +++ b/apt-inst/extract.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: extract.cc,v 1.2 2001/02/20 07:03:16 jgg Exp $ +// $Id: extract.cc,v 1.3 2001/05/27 23:47:14 jgg Exp $ /* ###################################################################### Archive Extraction Directory Stream @@ -56,6 +56,7 @@ #include <unistd.h> #include <errno.h> #include <dirent.h> +#include <iostream.h> /*}}}*/ static const char *TempExt = "dpkg-tmp"; @@ -473,8 +474,8 @@ bool pkgExtract::CheckDirReplace(string Dir,unsigned int Depth) // Look up the node File = Dir + Dent->d_name; - pkgFLCache::NodeIterator Nde = FLCache.GetNode(File.begin(), - File.end(),0,false,false); + pkgFLCache::NodeIterator Nde = FLCache.GetNode(File.c_str(), + File.c_str() + File.length(),0,false,false); // The file is not owned by this package if (Nde.end() != false || Nde.RealPackage() != FLPkg) diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc index 211fc935e..3312af8ae 100644 --- a/apt-inst/filelist.cc +++ b/apt-inst/filelist.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: filelist.cc,v 1.2 2001/02/20 07:03:16 jgg Exp $ +// $Id: filelist.cc,v 1.3 2001/05/27 23:45:39 jgg Exp $ /* ###################################################################### File Listing - Manages a Cache of File -> Package names. @@ -47,6 +47,8 @@ #include <iostream> /*}}}*/ +using namespace std; + // FlCache::Header::Header - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Initialize the header variables. These are the defaults used when |