g++ 4.7 fixes

apt-pkg/contrib/hashsum_template.h

@@ -17,6 +17,8 @@
 #include <algorithm>
 #include <stdint.h>
 
+#include <apt-pkg/strutl.h>
+
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;

cmdline/apt-mark.cc

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

debian/changelog

@@ -35,6 +35,9 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low
     - drop the explicit export of gz-compression handling
   * apt-pkg/cdrom.cc:
     - support InRelease files on cdrom
+  
+  [ Michael Vogt ]
+  * g++ 4.7 fixes
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 11 Dec 2011 19:34:58 +0100