g++ 4.7 fixes

diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
index 27d192b82ad92e61c3226bd2b00d30961ed928ad..d2d9f92edfef2439bd31f56cb0fd90e17035341e 100644 (file)
--- 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 339cbdf447c4851d2a46e50c4644b8eec645f980..9a628d71499dedca6f264bde3acc8bfb35d1eae2 100644 (file)
--- 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 df50eefbd5c8f2f9a776ebd4df6e037b102093e8..e6389dd06e88da9e66b7e2853eab210cb3b5b8a1 100644 (file)
--- 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