diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:59:57 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:59:57 +0000 |
| commit | 584e4558eea7db76c50bb9525cc25ae81b657d52 (patch) | |
| tree | 575805153e35160d611710a9e98724b44c827583 /apt-pkg | |
| parent | 1809f8d29cee7a6328be806548317bc99632a61b (diff) | |
Some more g++-3.2 fixes.
Author: doogie
Date: 2002-11-11 06:55:50 GMT
Some more g++-3.2 fixes.
Diffstat (limited to 'apt-pkg')
| -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 |
4 files changed, 9 insertions, 7 deletions
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; |