G++3 fixes from Randolph

Author: jgg
Date: 2001-05-29 04:08:09 GMT
G++3 fixes from Randolph

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 7aea89317fd00b7591554c2f6e54dfd3b7bf5640..accdaeb616e9eb3d92518fdc0fb53f51c1e6fe6a 100644 (file)
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: writer.cc,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: writer.cc,v 1.3 2001/05/29 04:08:09 jgg Exp $
 /* ######################################################################
 
    Writer 
@@ -26,12 +26,14 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <ftw.h>
+#include <iostream>
     
 #include "cachedb.h"
 #include "apt-ftparchive.h"
 #include "multicompress.h"
                                                                        /*}}}*/
 
+using namespace std;
 FTWScanner *FTWScanner::Owner;
 
 // FTWScanner::FTWScanner - Constructor                                        /*{{{*/
@@ -575,8 +577,7 @@ bool SourcesWriter::DoPackage(string FileName)
    string NewFileName;
    if (DirStrip.empty() == false &&
        FileName.length() > DirStrip.length() &&
-       stringcmp(OriginalPath,OriginalPath + DirStrip.length(),
-                DirStrip.begin(),DirStrip.end()) == 0)
+       stringcmp(DirStrip,OriginalPath,OriginalPath + DirStrip.length()) == 0)
       NewFileName = string(OriginalPath + DirStrip.length());
    else 
       NewFileName = OriginalPath;

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index a5fb6f52b9fd8e2b3394d13be20f3e82f387bd33..cc63758752a379bd381bf7152d408dd4861e2b2e 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: writer.h,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: writer.h,v 1.3 2001/05/29 04:08:09 jgg Exp $
 /* ######################################################################
 
    Writer 
@@ -19,10 +19,15 @@
 
 #include <string>
 #include <stdio.h>
+#include <iostream>
 
 #include "cachedb.h"
 #include "override.h"
 #include "apt-ftparchive.h"
+
+using std::string;
+using std::cout;
+using std::endl;
     
 class FTWScanner
 {