summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:57:53 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:57:53 +0000
commit4d055c05ce287dabd9e224af5c71d690a44b2db6 (patch)
tree2b2c9a976dc88f1aec2b381f0c03c8ed597adeab /apt-pkg
parent233b185f104d72df97b953362ef154e628a3c4c8 (diff)
G++3 fixes from Randolph
Author: jgg Date: 2001-05-07 05:25:13 GMT G++3 fixes from Randolph
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/contrib/error.cc7
-rw-r--r--apt-pkg/contrib/fileutl.cc5
-rw-r--r--apt-pkg/contrib/progress.cc7
3 files changed, 14 insertions, 5 deletions
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index b60bd09a7..6aa740d29 100644
--- 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 97dcb82b8..4db73c479 100644
--- 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 70e488d5f..ab81e0643 100644
--- 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 /*{{{*/
// ---------------------------------------------------------------------
/* */