diff options
| -rw-r--r-- | apt-inst/contrib/extracttar.cc | 3 | ||||
| -rw-r--r-- | apt-inst/deb/dpkgdb.cc | 3 | ||||
| -rw-r--r-- | apt-inst/extract.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/algorithms.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/contrib/cmndline.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/contrib/configuration.h | 6 | ||||
| -rw-r--r-- | apt-pkg/pkgsystem.h | 4 | ||||
| -rw-r--r-- | debian/changelog | 4 |
8 files changed, 17 insertions, 12 deletions
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index e0feaee12..41cc9c8ec 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.5 2002/03/26 07:38:58 jgg Exp $ +// $Id: extracttar.cc,v 1.6 2002/11/11 06:55:50 doogie Exp $ /* ###################################################################### Extract a Tar - Tar Extractor @@ -32,6 +32,7 @@ #include <fcntl.h> #include <iostream> /*}}}*/ +using namespace std; // The on disk header for a tar file. struct ExtractTar::TarHeader diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index 6c790540c..cc3bd966b 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.5 2002/03/26 07:38:58 jgg Exp $ +// $Id: dpkgdb.cc,v 1.6 2002/11/11 06:55:50 doogie Exp $ /* ###################################################################### DPKGv1 Database Implemenation @@ -33,6 +33,7 @@ #include <ctype.h> #include <iostream> /*}}}*/ +using namespace std; // EraseDir - Erase A Directory /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index d184a5e9d..5e3ed5af8 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.4 2002/03/26 07:38:57 jgg Exp $ +// $Id: extract.cc,v 1.5 2002/11/11 06:55:50 doogie Exp $ /* ###################################################################### Archive Extraction Directory Stream @@ -58,6 +58,7 @@ #include <dirent.h> #include <iostream> /*}}}*/ +using namespace std; static const char *TempExt = "dpkg-tmp"; //static const char *NewExt = "dpkg-new"; diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index fec16e095..3e3675995 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: algorithms.cc,v 1.42 2002/11/09 23:10:32 doogie Exp $ +// $Id: algorithms.cc,v 1.43 2002/11/11 06:55:50 doogie Exp $ /* ###################################################################### Algorithms - A set of misc algorithms @@ -26,6 +26,7 @@ #include <iostream> /*}}}*/ +using namespace std; pkgProblemResolver *pkgProblemResolver::This = 0; diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 807383560..6f0de103b 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cmndline.cc,v 1.13 2002/09/14 05:29:22 jgg Exp $ +// $Id: cmndline.cc,v 1.14 2002/11/11 06:58:55 doogie Exp $ /* ###################################################################### Command Line Class - Sophisticated command line parser @@ -20,6 +20,7 @@ #include <apti18n.h> /*}}}*/ +using namespace std; // CommandLine::CommandLine - Constructor /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 418e210bc..0ed8f59d3 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: configuration.h,v 1.15 2002/11/09 17:11:25 doogie Exp $ +// $Id: configuration.h,v 1.16 2002/11/11 06:55:50 doogie Exp $ /* ###################################################################### Configuration Class @@ -91,8 +91,8 @@ class Configuration inline const Item *Tree(const char *Name) const {return Lookup(Name);}; - inline void Dump() { Dump(clog); }; - void Dump(ostream& str); + inline void Dump() { Dump(std::clog); }; + void Dump(std::ostream& str); Configuration(const Item *Root); Configuration(); diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h index 54da6fcc1..a7d555140 100644 --- a/apt-pkg/pkgsystem.h +++ b/apt-pkg/pkgsystem.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgsystem.h,v 1.5 2002/03/26 07:38:58 jgg Exp $ +// $Id: pkgsystem.h,v 1.6 2002/11/11 06:55:50 doogie Exp $ /* ###################################################################### System - Abstraction for running on different systems. @@ -79,7 +79,7 @@ class pkgSystem virtual bool ArchiveSupported(const char *Type) = 0; // Return a list of system index files.. - virtual bool AddStatusFiles(vector<pkgIndexFile *> &List) = 0; + virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) = 0; virtual bool FindIndex(pkgCache::PkgFileIterator File, pkgIndexFile *&Found) const = 0; diff --git a/debian/changelog b/debian/changelog index cf266558f..7a9fb1e5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,7 @@ apt (0.5.5) unstable; urgency=low #139994, #142955, #151654, #151834, #147611, #154268 * Fix possibility for tag file parsing to fail in some unlikely situations. Closes: #139328 - * Use std C++ names for some header files. Closes: #128741 + * Use std C++ names for some header files. Closes: #128741, * Do not check for free space if --no-download. Closes: #117856 * Actually implement or group handling for 'upgrade'. Closes: #133950 * "Internal Error, Couldn't configure pre-depend" is not actually an @@ -48,7 +48,7 @@ apt (0.5.5) unstable; urgency=low * Show file name on apt-extracttemplate error messges. Closes: #151835 * i18n gettext stuff, based on work from Michael Piefel: Closes: #95933 * Some highly unlikely memory faults. Closes: #155842 - * C++ stuff for G++3.2. Closes: #162617 + * C++ stuff for G++3.2. Closes: #162617, #165515, * apt-config dumps sends to stdout not stderr now. Closes: #146294 * Fix segfault in FindAny when /i is used, and there is no default. Closes: #165891 |