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 ++
 cmdline/apt-mark.cc                | 1 +
 debian/changelog                   | 3 +++
 3 files changed, 6 insertions(+)

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
 {
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 339cbdf44..9a628d714 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -16,6 +16,7 @@
 #include <apt-pkg/pkgsystem.h>
 
 #include <algorithm>
+#include <unistd.h>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/debian/changelog b/debian/changelog
index df50eefbd..e6389dd06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ apt (0.8.16~exp8) experimental; urgency=low
     - use a pointer-union to peace gcc strict-aliasing warning
   * apt-pkg/deb/deblistparser.cc:
     - M-A: foreign packages provide for other archs, too
+  
+  [ Michael Vogt ]
+  * g++ 4.7 fixes
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 03 Nov 2011 09:40:29 -0500
 
-- 
cgit v1.2.3