Browse Source

G++3 fixes from Randolph
Author: jgg
Date: 2001-05-07 05:05:13 GMT
G++3 fixes from Randolph

Arch Librarian 22 years ago
parent
commit
233b185f10

+ 3 - 1
apt-pkg/contrib/cdromutl.h

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: cdromutl.h,v 1.2 1999/06/05 03:54:29 jgg Exp $
+// $Id: cdromutl.h,v 1.3 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
 /* ######################################################################
 
 
    CDROM Utilities - Some functions to manipulate CDROM mounts.
    CDROM Utilities - Some functions to manipulate CDROM mounts.
@@ -12,6 +12,8 @@
 
 
 #include <string>
 #include <string>
 
 
+using std::string;
+
 #ifdef __GNUG__
 #ifdef __GNUG__
 #pragma interface "apt-pkg/cdromutl.h"
 #pragma interface "apt-pkg/cdromutl.h"
 #endif 
 #endif 

+ 3 - 1
apt-pkg/contrib/configuration.h

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: configuration.h,v 1.13 2001/03/11 07:22:19 jgg Exp $
+// $Id: configuration.h,v 1.14 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
 /* ######################################################################
 
 
    Configuration Class
    Configuration Class
@@ -34,6 +34,8 @@
 
 
 #include <string>
 #include <string>
 
 
+using std::string;
+
 class Configuration
 class Configuration
 {
 {
    public:
    public:

+ 3 - 1
apt-pkg/contrib/error.h

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: error.h,v 1.7 2001/02/20 07:03:17 jgg Exp $
+// $Id: error.h,v 1.8 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
 /* ######################################################################
    
    
    Global Erorr Class - Global error mechanism
    Global Erorr Class - Global error mechanism
@@ -55,6 +55,8 @@
     
     
 #include <string>
 #include <string>
 
 
+using std::string;
+
 class GlobalError
 class GlobalError
 {
 {
    struct Item
    struct Item

+ 3 - 1
apt-pkg/contrib/fileutl.h

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: fileutl.h,v 1.25 2001/04/22 05:42:53 jgg Exp $
+// $Id: fileutl.h,v 1.26 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
 /* ######################################################################
    
    
    File Utilities
    File Utilities
@@ -27,6 +27,8 @@
 
 
 #include <string>
 #include <string>
 
 
+using std::string;
+
 class FileFd
 class FileFd
 {
 {
    protected:
    protected:

+ 3 - 1
apt-pkg/contrib/md5.h

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: md5.h,v 1.5 2001/02/20 07:03:17 jgg Exp $
+// $Id: md5.h,v 1.6 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
 /* ######################################################################
    
    
    MD5SumValue - Storage for a MD5Sum
    MD5SumValue - Storage for a MD5Sum
@@ -29,6 +29,8 @@
 
 
 #include <string>
 #include <string>
 
 
+using std::string;
+
 class MD5Summation;
 class MD5Summation;
 
 
 class MD5SumValue
 class MD5SumValue

+ 3 - 1
apt-pkg/contrib/progress.h

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: progress.h,v 1.5 1999/01/18 06:20:08 jgg Exp $
+// $Id: progress.h,v 1.6 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
 /* ######################################################################
    
    
    OpProgress - Operation Progress
    OpProgress - Operation Progress
@@ -28,6 +28,8 @@
 #include <string>
 #include <string>
 #include <sys/time.h>
 #include <sys/time.h>
 
 
+using std::string;
+
 class Configuration;
 class Configuration;
 class OpProgress
 class OpProgress
 {
 {

+ 3 - 1
apt-pkg/contrib/sha1.h

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: sha1.h,v 1.2 2001/04/25 07:30:13 tausq Exp $
+// $Id: sha1.h,v 1.3 2001/05/07 05:05:47 jgg Exp $
 /* ######################################################################
 /* ######################################################################
 
 
    SHA1SumValue - Storage for a SHA-1 hash.
    SHA1SumValue - Storage for a SHA-1 hash.
@@ -20,6 +20,8 @@
 
 
 #include <string>
 #include <string>
 
 
+using std::string;
+
 class SHA1Summation;
 class SHA1Summation;
 
 
 class SHA1SumValue
 class SHA1SumValue

+ 2 - 1
apt-pkg/deb/debversion.cc

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: debversion.cc,v 1.2 2001/02/20 07:03:17 jgg Exp $
+// $Id: debversion.cc,v 1.3 2001/05/07 05:14:53 jgg Exp $
 /* ######################################################################
 /* ######################################################################
 
 
    Debian Version - Versioning system for Debian
    Debian Version - Versioning system for Debian
@@ -19,6 +19,7 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgcache.h>
 
 
 #include <stdlib.h>
 #include <stdlib.h>
+#include <ctype.h>
 									/*}}}*/
 									/*}}}*/
 
 
 debVersioningSystem debVS;
 debVersioningSystem debVS;

+ 5 - 2
apt-pkg/deb/dpkgpm.cc

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: dpkgpm.cc,v 1.19 2001/02/22 06:26:27 jgg Exp $
+// $Id: dpkgpm.cc,v 1.20 2001/05/07 05:14:24 jgg Exp $
 /* ######################################################################
 /* ######################################################################
 
 
    DPKG Package Manager - Provide an interface to dpkg
    DPKG Package Manager - Provide an interface to dpkg
@@ -16,7 +16,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/strutl.h>
-    
+
 #include <unistd.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <fcntl.h>
@@ -25,6 +25,9 @@
 #include <signal.h>
 #include <signal.h>
 #include <errno.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdio.h>
+#include <iostream>
+
+using namespace std;
 									/*}}}*/
 									/*}}}*/
 
 
 // DPkgPM::pkgDPkgPM - Constructor					/*{{{*/
 // DPkgPM::pkgDPkgPM - Constructor					/*{{{*/

+ 3 - 1
apt-pkg/deb/dpkgpm.h

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: dpkgpm.h,v 1.7 2001/02/20 07:03:17 jgg Exp $
+// $Id: dpkgpm.h,v 1.8 2001/05/07 05:05:13 jgg Exp $
 /* ######################################################################
 /* ######################################################################
 
 
    DPKG Package Manager - Provide an interface to dpkg
    DPKG Package Manager - Provide an interface to dpkg
@@ -18,6 +18,8 @@
 #include <vector>
 #include <vector>
 #include <stdio.h>
 #include <stdio.h>
 
 
+using std::vector;
+
 class pkgDPkgPM : public pkgPackageManager
 class pkgDPkgPM : public pkgPackageManager
 {
 {
    protected:
    protected: