Browse Source

Some more g++-3.2 fixes.

Author: doogie
Date: 2002-11-11 06:55:50 GMT
Some more g++-3.2 fixes.
debian/1.8.y
Arch Librarian 18 years ago
parent
commit
584e4558ee
  1. 3
      apt-inst/contrib/extracttar.cc
  2. 3
      apt-inst/deb/dpkgdb.cc
  3. 3
      apt-inst/extract.cc
  4. 3
      apt-pkg/algorithms.cc
  5. 3
      apt-pkg/contrib/cmndline.cc
  6. 6
      apt-pkg/contrib/configuration.h
  7. 4
      apt-pkg/pkgsystem.h
  8. 4
      debian/changelog

3
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

3
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 /*{{{*/
// ---------------------------------------------------------------------

3
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";

3
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;

3
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 /*{{{*/
// ---------------------------------------------------------------------

6
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();

4
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;

4
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

Loading…
Cancel
Save