From 109eb1511d0cdfa4af3196105cada30bcbb77bc8 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 17 Dec 2011 23:53:31 +0100
Subject: try to avoid direct usage of .Fd() if possible and do read()s and co
 on the FileFd instead

---
 apt-pkg/contrib/hashsum_template.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'apt-pkg/contrib/hashsum_template.h')

diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
index 6301ac9d0..51e3b0862 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>
@@ -108,6 +110,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
-- 
cgit v1.2.3


From e75aa33384d52635fba502bed628bc68f9cb5066 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 2 Jan 2012 15:08:58 +0100
Subject: g++ 4.7 fixes

---
 apt-pkg/contrib/hashsum_template.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg/contrib/hashsum_template.h')

diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
index 27d192b82..d2d9f92ed 100644
--- a/apt-pkg/contrib/hashsum_template.h
+++ b/apt-pkg/contrib/hashsum_template.h
@@ -15,6 +15,8 @@
 #include <algorithm>
 #include <stdint.h>
 
+#include <apt-pkg/strutl.h>
+
 template<int N>
 class HashSumValue
 {
-- 
cgit v1.2.3