G++3 fixes from Randolph

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

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index b60bd09a7a9d40db6226f18f312758d2a5f9409e..6aa740d291b7952f850397c55035333ecf2a780e 100644 (file)
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: error.cc,v 1.9 2001/02/20 07:03:17 jgg Exp $
+// $Id: error.cc,v 1.10 2001/05/07 05:28:44 jgg Exp $
 /* ######################################################################
    
    Global Erorr Class - Global error mechanism
@@ -20,15 +20,18 @@
 
 #include <apt-pkg/error.h>
 
+#include <iostream.h>
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
+#include <string>
 #include <stdarg.h>
 #include <unistd.h>
 
 #include "config.h"
                                                                        /*}}}*/
 
+using namespace std;
+
 // Global Error Object                                                 /*{{{*/
 /* If the implementation supports posix threads then the accessor function
    is compiled to be thread safe otherwise a non-safe version is used. A

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 97dcb82b8fb6e114be13a20414509b4af9cdf7b1..4db73c47934b72be6817351cea915a521b831509 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: fileutl.cc,v 1.38 2001/04/22 05:42:52 jgg Exp $
+// $Id: fileutl.cc,v 1.39 2001/05/07 05:30:31 jgg Exp $
 /* ######################################################################
    
    File Utilities
@@ -23,6 +23,7 @@
 
 #include <apti18n.h>
 
+#include <iostream>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -33,6 +34,8 @@
 #include <errno.h>
                                                                        /*}}}*/
 
+using namespace std;
+
 // CopyFile - Buffered copy of a file                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* The caller is expected to set things so that failure causes erasure */

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 70e488d5feadfd9826b9c663552daa3d1b2fd4dc..ab81e064350818a01bf6585e4167359222cc94f0 100644 (file)
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: progress.cc,v 1.10 2001/02/20 07:03:17 jgg Exp $
+// $Id: progress.cc,v 1.11 2001/05/07 05:25:13 jgg Exp $
 /* ######################################################################
    
    OpProgress - Operation Progress
@@ -16,10 +16,13 @@
 #include <apt-pkg/configuration.h>
 
 #include <apti18n.h>
-    
+
+#include <iostream>
 #include <stdio.h>
                                                                        /*}}}*/
 
+using namespace std;
+
 // OpProgress::OpProgress - Constructor                                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */