summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:58:14 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:58:14 +0000
commit812f4169fee839b6cc6532a76276e0a957aeba77 (patch)
treee2b2ef77664716660b08560d8655b46c4b477cf3
parent0a5e4a031a039329cc0d27268be6a623e892c452 (diff)
G++3 fixes from Randolph
Author: jgg Date: 2001-05-29 03:48:27 GMT G++3 fixes from Randolph
-rw-r--r--ftparchive/apt-ftparchive.h5
-rw-r--r--ftparchive/cachedb.cc4
-rw-r--r--ftparchive/multicompress.cc5
-rw-r--r--ftparchive/override.h5
4 files changed, 14 insertions, 5 deletions
diff --git a/ftparchive/apt-ftparchive.h b/ftparchive/apt-ftparchive.h
index c228903ba..c364d670e 100644
--- a/ftparchive/apt-ftparchive.h
+++ b/ftparchive/apt-ftparchive.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: apt-ftparchive.h,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: apt-ftparchive.h,v 1.3 2001/05/29 03:51:37 jgg Exp $
/* ######################################################################
Writer
@@ -19,6 +19,9 @@
#include <fstream>
+using std::ostream;
+using std::ofstream;
+
extern ostream c0out;
extern ostream c1out;
extern ostream c2out;
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index dd63f215a..cbcdfedc6 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: cachedb.cc,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: cachedb.cc,v 1.3 2001/05/29 03:50:33 jgg Exp $
/* ######################################################################
CacheDB
@@ -213,7 +213,7 @@ bool CacheDB::GetMD5(string &MD5Res,bool GenOnly)
MD5Res = MD5.Result();
InitQuery("m5");
- if (Put(MD5Res.begin(),MD5Res.length()) == true)
+ if (Put(MD5Res.c_str(),MD5Res.length()) == true)
CurStat.Flags |= FlMD5;
return true;
}
diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index 932ad6758..56a1a41a2 100644
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: multicompress.cc,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: multicompress.cc,v 1.3 2001/05/29 03:48:27 jgg Exp $
/* ######################################################################
MultiCompressor
@@ -28,8 +28,11 @@
#include <sys/stat.h>
#include <utime.h>
#include <unistd.h>
+#include <iostream>
/*}}}*/
+using namespace std;
+
const MultiCompress::CompType MultiCompress::Compressors[] =
{{".","",0,0,0,1},
{"gzip",".gz","gzip","-9n","-d",2},
diff --git a/ftparchive/override.h b/ftparchive/override.h
index 63f123c42..5917b9c92 100644
--- a/ftparchive/override.h
+++ b/ftparchive/override.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: override.h,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: override.h,v 1.3 2001/05/29 03:49:53 jgg Exp $
/* ######################################################################
Override
@@ -18,6 +18,9 @@
#include <map>
#include <string>
+
+using std::string;
+using std::map;
class Override
{