diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-02 15:15:54 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-02 15:15:54 +0100 |
| commit | 5c6ceb4557cb6497dea827d1ec4e2615ccd53e50 (patch) | |
| tree | a98d612052784b14099811021251d1e4c6e295b4 | |
| parent | 72b2accb108e3d3ec8113ce2d183638c719a5d0d (diff) | |
| parent | e75aa33384d52635fba502bed628bc68f9cb5066 (diff) | |
g++ 4.7 fixes
| -rw-r--r-- | apt-pkg/contrib/hashsum_template.h | 2 | ||||
| -rw-r--r-- | cmdline/apt-mark.cc | 1 | ||||
| -rw-r--r-- | debian/changelog | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h index 51e3b0862..9bf160b2b 100644 --- a/apt-pkg/contrib/hashsum_template.h +++ b/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; diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index dbbef5013..c7d9b6f6a 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 f6a6d38e7..06c84f31c 100644 --- a/debian/changelog +++ b/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 |