From 4f333a8bea2c8431df2ec92001981355623818e8 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 10 Sep 2007 16:03:07 +0200
Subject: * make apt build with g++ 4.3

---
 apt-inst/filelist.h         | 2 +-
 apt-pkg/contrib/error.cc    | 4 +++-
 apt-pkg/contrib/fileutl.cc  | 2 ++
 apt-pkg/contrib/md5.cc      | 1 +
 apt-pkg/contrib/md5.h       | 1 +
 apt-pkg/contrib/mmap.cc     | 2 ++
 apt-pkg/contrib/progress.cc | 1 +
 apt-pkg/contrib/sha1.h      | 1 +
 apt-pkg/contrib/sha256.h    | 1 +
 apt-pkg/indexfile.cc        | 1 +
 apt-pkg/pkgsystem.cc        | 1 +
 debian/changelog            | 1 +
 ftparchive/writer.cc        | 1 +
 13 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index 86766254f..c74a310e4 100644
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -29,7 +29,7 @@
 #define PKGLIB_FILELIST_H
 
 
-
+#include <cstring>
 #include <apt-pkg/mmap.h>
 
 class pkgFLCache
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 8c2d6cb19..db8c53c36 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -19,10 +19,12 @@
 #include <iostream>
 #include <errno.h>
 #include <stdio.h>
-#include <string>
 #include <stdarg.h>
 #include <unistd.h>
 
+#include <string>
+#include <cstring>
+
 #include "config.h"
    									/*}}}*/
 
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index d19a92e62..9e13b4f60 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -22,6 +22,8 @@
 #include <apti18n.h>
 
 #include <cstdlib>
+#include <cstring>
+
 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 44242371a..a095f8f0f 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -44,6 +44,7 @@
 #include <inttypes.h>
 #include <config.h>
 #include <system.h>
+
 									/*}}}*/
 
 // byteSwap - Swap bytes in a buffer					/*{{{*/
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 247b3fab9..96c8975b4 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -25,6 +25,7 @@
 
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 #include <stdint.h>
 
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 88e71e8e3..7f814c2d2 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -31,6 +31,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+
+#include <cstring>
    									/*}}}*/
 
 // MMap::MMap - Constructor						/*{{{*/
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 6ce6e950a..cffdddc4f 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -16,6 +16,7 @@
 
 #include <iostream>
 #include <stdio.h>
+#include <cstring>
 									/*}}}*/
 
 using namespace std;
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 010ef802e..8ddd889f1 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -15,6 +15,7 @@
 #define APTPKG_SHA1_H
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 
 using std::string;
diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
index c490bfa4d..1951f053b 100644
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@ -15,6 +15,7 @@
 #define APTPKG_SHA256_H
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 
 using std::string;
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index ca11fc111..cf238eb4a 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -13,6 +13,7 @@
 #include <apt-pkg/error.h>
 
 #include <clocale>
+#include <cstring>
 									/*}}}*/
 
 // Global list of Item supported
diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index eee19e35c..6dd2d3ee4 100644
--- a/apt-pkg/pkgsystem.cc
+++ b/apt-pkg/pkgsystem.cc
@@ -13,6 +13,7 @@
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/policy.h>
 #include <cassert>
+#include <cstring>
 									/*}}}*/
 
 pkgSystem *_system = 0;
diff --git a/debian/changelog b/debian/changelog
index e2c0e5303..bf5afb3b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ apt (0.7.7) UNRELEASED; urgency=low
   * apt-pkg/acquire.cc:
     - increase MaxPipeDepth for the internal worker<->method
       communication to 1000 for the debtorrent backend
+  * make apt build with g++ 4.3
 
   [ Ian Jackson ]
   * dpkg-triggers: Deal properly with new package states.
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 59107e02b..9d248ab86 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -28,6 +28,7 @@
 #include <ftw.h>
 #include <fnmatch.h>
 #include <iostream>
+#include <memory>
     
 #include "cachedb.h"
 #include "apt-ftparchive.h"
-- 
cgit v1.2.3