g++ 4.7 fixes

diff --cc apt-pkg/contrib/hashsum_template.h
index 51e3b08620f3156e480a5e100a1932555e36cec0,d2d9f92edfef2439bd31f56cb0fd90e17035341e..9bf160b2be527b92e09d33b55c4b51906801af59
--- 1/apt-pkg/contrib/hashsum_template.h
--- 2/apt-pkg/contrib/hashsum_template.h
+++ b/apt-pkg/contrib/hashsum_template.h
@@@ -17,11 -15,8 +17,13 @@@
  #include <algorithm>
  #include <stdint.h>
  
+ #include <apt-pkg/strutl.h>
+ 
 +#ifndef APT_8_CLEANER_HEADERS
 +using std::string;
 +using std::min;
 +#endif
 +
  template<int N>
  class HashSumValue
  {

diff --cc cmdline/apt-mark.cc
Simple merge

diff --cc debian/changelog
index f6a6d38e7692d49eebdcc200a6d34b3939e3daf5,e6389dd06e88da9e66b7e2853eab210cb3b5b8a1..06c84f31c02d219e2d93b02003f1645c72f31b9e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,3 +1,46 @@@
 +apt (0.8.16~exp9) UNRELEASED; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/cdrom.cc:
 +    - Accept .bz2, .xz files in addition to .gz files (Closes: #649451)
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/cdrom.cc:
 +    - use aptconfiguration to get the supported compression types
 +  * debian/control:
 +    - bump debhelper build-dep to debhelper (>= 8.1.3~)
 +    - set libapt-pkg-dev to multi-arch: same too
 +
 +  [ Colin Watson ]
 +  * Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same.
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/cacheset.cc:
 +    - make the cachesets real containers which can embedding any container
 +      to be able to use the same interface regardless of set or list usage
 +    - provide a {Package,Version}List similar to {Package,Version}Set
 +  * cmdline/apt-{get,cache,mark}.cc:
 +    - use Lists instead of Sets if input order should be preserved for
 +      commands accepting lists of packages, e.g. policy (Closes: #625960)
 +  * apt-pkg/depcache.cc:
 +    - prefer native providers over foreigns even if the chain is foreign
 +  * cmdline/apt-get.cc:
 +    - ignore foreign architectures if we check if a provides has only one
 +      resolver as it's basically the same for the user, so no need to choose
 +  * cmdline/apt-config.cc:
 +    - dump the APT::Compressor settings correctly and completely
 +  * apt-pkg/contrib/fileutl.{h,cc}:
 +    - implement a ModificationTime method for FileFd
 +    - add a ReadLine method
 +    - 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
 +
  apt (0.8.16~exp8) experimental; urgency=low
  
    [ David Kalnischkies ]