G++3 fixes from Randolph

Author: jgg
Date: 2001-05-22 04:01:41 GMT
G++3 fixes from Randolph

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index c367c99a1de435f78aac5bbddcc5e5a276dd1f64..a2045e729a5b79a1f22a9ebccf94ceb13257273b 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cdrom.cc,v 1.17 2000/01/17 07:11:49 jgg Exp $
+// $Id: cdrom.cc,v 1.18 2001/05/22 04:01:41 jgg Exp $

 /* ######################################################################
 
    CDROM URI method for APT
 /* ######################################################################
 
    CDROM URI method for APT


@@ -16,8 +16,12 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <sys/stat.h>
 #include <unistd.h>

+
+#include <iostream>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+using namespace std;
+

 class CDROMMethod : public pkgAcqMethod
 {
    bool DatabaseLoaded;
 class CDROMMethod : public pkgAcqMethod
 {
    bool DatabaseLoaded;

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 89f144fe5d5a1cd5005abf904b28c769e050504c..bbc4a3f22704f5b9945ca9de544eaaa2c9eba8f4 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: ftp.cc,v 1.27 2001/04/10 04:51:50 jgg Exp $
+// $Id: ftp.cc,v 1.28 2001/05/22 04:02:00 jgg Exp $

 /* ######################################################################
 
    FTP Aquire Method - This is the FTP aquire method for APT.
 /* ######################################################################
 
    FTP Aquire Method - This is the FTP aquire method for APT.


@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>

+#include <iostream>

 
 // Internet stuff
 #include <netinet/in.h>
 
 // Internet stuff
 #include <netinet/in.h>


@@ -40,6 +41,8 @@
 #include "ftp.h"
                                                                        /*}}}*/
 
 #include "ftp.h"
                                                                        /*}}}*/
 

+using namespace std;
+

 /* This table is for the EPRT and EPSV commands, it maps the OS address
    family to the IETF address families */
 struct AFMap
 /* This table is for the EPRT and EPSV commands, it maps the OS address
    family to the IETF address families */
 struct AFMap