g++ 4.7 fixes

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
 {

cmdline/apt-mark.cc

@@ -16,6 +16,7 @@
 #include <apt-pkg/pkgsystem.h>
 
 #include <algorithm>
+#include <unistd.h>
 
 #include <apti18n.h>
 									/*}}}*/

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