diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-09 00:19:51 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-09 00:19:51 +0200 |
| commit | 408a4726131e9db26ff868623a5d216a26c45a50 (patch) | |
| tree | a8b470ee8fd8d22e74e1245edb2b36400b9226dd /apt-pkg/cdrom.h | |
| parent | 1979e742ad5e2a0b6e547fbe3f4c4066b5a9bd2e (diff) | |
| parent | 484dbb814fd2b787b2206ffe9504798dfd73ae6c (diff) | |
* huge merge to bring the apt debian-sid and ubuntu branches as close
as possible to apt--mvo again
Diffstat (limited to 'apt-pkg/cdrom.h')
| -rw-r--r-- | apt-pkg/cdrom.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 085eb64e2..68d61c098 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -5,9 +5,6 @@ #include<string> #include<vector> -#ifdef __GNUG__ -#pragma interface "apt-pkg/cdrom.h" -#endif using namespace std; @@ -50,8 +47,11 @@ class pkgCdrom }; - bool FindPackages(string CD,vector<string> &List, - vector<string> &SList, vector<string> &SigList, + bool FindPackages(string CD, + vector<string> &List, + vector<string> &SList, + vector<string> &SigList, + vector<string> &TransList, string &InfoDir, pkgCdromStatus *log, unsigned int Depth = 0); bool DropBinaryArch(vector<string> &List); |