diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:15 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:15 +0000 |
| commit | 8c58f506d753d736184f3d764a200efce6c9cdf3 (patch) | |
| tree | 3367f2b073ff279ddb94bf1c41f25c89a888a242 | |
| parent | 812f4169fee839b6cc6532a76276e0a957aeba77 (diff) | |
G++3 fixes from Randolph
Author: jgg
Date: 2001-05-29 04:08:09 GMT
G++3 fixes from Randolph
| -rw-r--r-- | ftparchive/writer.cc | 7 | ||||
| -rw-r--r-- | ftparchive/writer.h | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 7aea89317..accdaeb61 100644 --- 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 a5fb6f52b..cc6375875 100644 --- 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 { |