diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-16 22:17:23 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-16 22:17:23 +0100 |
| commit | e70c1d067335bfa686fa0c6e75e32afb095e1aaa (patch) | |
| tree | e985e74ed4d613126b24839d710e4b49db753824 /apt-pkg/contrib/hashsum_template.h | |
| parent | e75aa33384d52635fba502bed628bc68f9cb5066 (diff) | |
| parent | 85e1885525977809ff6a3b70abb84d3a63e41817 (diff) | |
merged from debian-experimental2
Diffstat (limited to 'apt-pkg/contrib/hashsum_template.h')
| -rw-r--r-- | apt-pkg/contrib/hashsum_template.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h index d2d9f92ed..9bf160b2b 100644 --- a/apt-pkg/contrib/hashsum_template.h +++ b/apt-pkg/contrib/hashsum_template.h @@ -10,6 +10,8 @@ #ifndef APTPKG_HASHSUM_TEMPLATE_H #define APTPKG_HASHSUM_TEMPLATE_H +#include <apt-pkg/fileutl.h> + #include <string> #include <cstring> #include <algorithm> @@ -17,6 +19,11 @@ #include <apt-pkg/strutl.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +using std::min; +#endif + template<int N> class HashSumValue { @@ -105,6 +112,7 @@ class SummationImplementation { return Add((const unsigned char *)Beg, End - Beg); }; bool AddFD(int Fd, unsigned long long Size = 0); + bool AddFD(FileFd &Fd, unsigned long long Size = 0); }; #endif |