diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-10-07 16:38:03 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-07 16:38:03 +0200 |
| commit | 4d0818cc39f7c0d44ecdfcdf9701058f81caa492 (patch) | |
| tree | 63eaa546ba527209d2b2068d188800e5e4872093 /apt-pkg/indexcopy.h | |
| parent | ea7682a0d91fee638eef06b63045b1499ddf50ac (diff) | |
| parent | 00a06b8eb82cf930511fc003bd16d7034e5a0cb5 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts:
apt-pkg/acquire-item.cc
Diffstat (limited to 'apt-pkg/indexcopy.h')
| -rw-r--r-- | apt-pkg/indexcopy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index 43cdb3f0a..ca33a2cb8 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -93,8 +93,8 @@ class SigVerify /*{{{*/ /** \brief dpointer placeholder (for later in case we need it) */ void *d; - bool Verify(std::string prefix,std::string file, indexRecords *records); - bool CopyMetaIndex(std::string CDROM, std::string CDName, + APT_HIDDEN bool Verify(std::string prefix,std::string file, indexRecords *records); + APT_HIDDEN bool CopyMetaIndex(std::string CDROM, std::string CDName, std::string prefix, std::string file); public: |