* make apt build with g++ 4.3

diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index 86766254f69003bb75c59dcbb4c55d81342915cd..c74a310e47c29d1b21aed6703019edcfff897dcf 100644 (file)
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -29,7 +29,7 @@
 #define PKGLIB_FILELIST_H
 
 
 #define PKGLIB_FILELIST_H
 
 

-
+#include <cstring>

 #include <apt-pkg/mmap.h>
 
 class pkgFLCache
 #include <apt-pkg/mmap.h>
 
 class pkgFLCache

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 8c2d6cb19a8a33ae3427dbfe87d68f8f117f0ea9..db8c53c36042342bf515405d9e0a668906b064ba 100644 (file)
--- 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 <iostream>
 #include <errno.h>
 #include <stdio.h>

-#include <string>

 #include <stdarg.h>
 #include <unistd.h>
 
 #include <stdarg.h>
 #include <unistd.h>
 

+#include <string>
+#include <cstring>
+

 #include "config.h"
                                                                        /*}}}*/
 
 #include "config.h"
                                                                        /*}}}*/
 

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index d19a92e62cc107b44bb1e103dca047cba0dd74af..9e13b4f60d05ebd916b15d958e095b2f941325cc 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -22,6 +22,8 @@
 #include <apti18n.h>
 
 #include <cstdlib>
 #include <apti18n.h>
 
 #include <cstdlib>

+#include <cstring>
+

 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>
 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 44242371a3201a0754e7d7d3b42abd9966fd1e52..a095f8f0fbebf2ba71da0d0d3c0380c9d755e1d6 100644 (file)
--- 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>
 #include <inttypes.h>
 #include <config.h>
 #include <system.h>

+

                                                                        /*}}}*/
 
 // byteSwap - Swap bytes in a buffer                                   /*{{{*/
                                                                        /*}}}*/
 
 // byteSwap - Swap bytes in a buffer                                   /*{{{*/

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 247b3fab936c28229071f2810d46956a325b5607..96c8975b46f6cc165b257f889bd1bb2f56ac5168 100644 (file)
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -25,6 +25,7 @@
 
 
 #include <string>
 
 
 #include <string>

+#include <cstring>

 #include <algorithm>
 #include <stdint.h>
 
 #include <algorithm>
 #include <stdint.h>
 

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 88e71e8e348074e5cb5cef1a09b9d69e043813eb..7f814c2d2a9b1e13c38e19e9c1d85aa2b64e6366 100644 (file)
--- 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 <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>

+
+#include <cstring>

                                                                        /*}}}*/
 
 // MMap::MMap - Constructor                                            /*{{{*/
                                                                        /*}}}*/
 
 // MMap::MMap - Constructor                                            /*{{{*/

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 6ce6e950a788a90d603ac693ac215113c8b43cb6..cffdddc4fe0d70a9f45e3fc5fadd3c73c7944168 100644 (file)
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -16,6 +16,7 @@
 
 #include <iostream>
 #include <stdio.h>
 
 #include <iostream>
 #include <stdio.h>

+#include <cstring>

                                                                        /*}}}*/
 
 using namespace std;
                                                                        /*}}}*/
 
 using namespace std;

diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 010ef802e642293a97e65f60df1e42a188f6bbff..8ddd889f18a22a70b2ac9015e4772fbc195ce3a1 100644 (file)
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -15,6 +15,7 @@
 #define APTPKG_SHA1_H
 
 #include <string>
 #define APTPKG_SHA1_H
 
 #include <string>

+#include <cstring>

 #include <algorithm>
 
 using std::string;
 #include <algorithm>
 
 using std::string;

diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
index c490bfa4df30cf348766f617470774013a9cdec3..1951f053bf1b15b8216dec13e4971fe45275f975 100644 (file)
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@ -15,6 +15,7 @@
 #define APTPKG_SHA256_H
 
 #include <string>
 #define APTPKG_SHA256_H
 
 #include <string>

+#include <cstring>

 #include <algorithm>
 
 using std::string;
 #include <algorithm>
 
 using std::string;

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index ca11fc11143e97ac2fed8324042800a839ba5aab..cf238eb4a4ea480ee0478ce4b8c951fe3ce87ce0 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -13,6 +13,7 @@
 #include <apt-pkg/error.h>
 
 #include <clocale>
 #include <apt-pkg/error.h>
 
 #include <clocale>

+#include <cstring>

                                                                        /*}}}*/
 
 // Global list of Item supported
                                                                        /*}}}*/
 
 // Global list of Item supported

diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index eee19e35c265c2239bb23860883db80adf62b94c..6dd2d3ee4df348eab8e2e05c3f3d5beff22126be 100644 (file)
--- 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 <apt-pkg/pkgsystem.h>
 #include <apt-pkg/policy.h>
 #include <cassert>

+#include <cstring>

                                                                        /*}}}*/
 
 pkgSystem *_system = 0;
                                                                        /*}}}*/
 
 pkgSystem *_system = 0;

diff --git a/debian/changelog b/debian/changelog
index e2c0e53036f5c416def99a8643e025bd202cfddd..bf5afb3b94c10f9fcbaa016ec376c6aa9cd4781e 100644 (file)
--- 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
   * 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.
 
   [ Ian Jackson ]
   * dpkg-triggers: Deal properly with new package states.

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 59107e02bbc930aa7fd750a1141fa013f94ced66..9d248ab86f2a7f30878448a513fc486e904b1ba2 100644 (file)
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -28,6 +28,7 @@
 #include <ftw.h>
 #include <fnmatch.h>
 #include <iostream>
 #include <ftw.h>
 #include <fnmatch.h>
 #include <iostream>

+#include <memory>

     
 #include "cachedb.h"
 #include "apt-ftparchive.h"
     
 #include "cachedb.h"
 #include "apt-ftparchive.h"