revert 2184.1.2: do not pollute namespace in headers

The breakage is just to big for now, so guard the change with
#ifndef APT_8_CLEANER_HEADERS and be nice to library users

diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 8754e8dcc0166399c438dc2af20dcb3aaef929a4..e104417c12890fdff4b7b8d09b02dada51be5960 100644 (file)
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -18,6 +18,10 @@
 
 #include <string>
 
 
 #include <string>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::min;
+#endif
+

 class pkgDirStream;
 
 class ExtractTar
 class pkgDirStream;
 
 class ExtractTar

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 93772403d5c37e8b369698d3ef05e726636fd261..3d5d7a4b78a9aa522af324e04537f52289995213 100644 (file)
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -75,6 +75,11 @@
 #include <sys/time.h>
 #include <unistd.h>
 
 #include <sys/time.h>
 #include <unistd.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::vector;
+using std::string;
+#endif
+

 class pkgAcquireStatus;
 
 /** \brief The core download scheduler.                                        {{{
 class pkgAcquireStatus;
 
 /** \brief The core download scheduler.                                        {{{

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 948fe110312689e06d05130a5e1e849a388d5692..fdb64fc5970ab6e866a1e050090b94d2e824e3c5 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -36,6 +36,10 @@
 
 #include <iostream>
 
 
 #include <iostream>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::ostream;
+#endif
+

 class pkgAcquireStatus;
 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 class pkgAcquireStatus;
 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 319254fd0b212983361226d85a8fc7fe8623ce7f..4fcf5abcd6965a490ccf064fde578073f4c35162 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -4,6 +4,10 @@
 #include<string>
 #include<vector>
 
 #include<string>
 #include<vector>
 

+#ifndef APT_8_CLEANER_HEADERS
+using namespace std;
+#endif
+

 class Configuration;
 class OpProgress;
 
 class Configuration;
 class OpProgress;
 

diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index 2c6afac0fbe7f97841d941a8b56a41478b5bb9bf..e94045b5c8cec8e56c610d761a8dda6a3e6c2d2c 100644 (file)
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -12,6 +12,10 @@
 
 #include <string>
 
 
 #include <string>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 // mount cdrom, DeviceName (e.g. /dev/sr0) is optional
 bool MountCdrom(std::string Path, std::string DeviceName="");
 bool UnmountCdrom(std::string Path);
 // mount cdrom, DeviceName (e.g. /dev/sr0) is optional
 bool MountCdrom(std::string Path, std::string DeviceName="");
 bool UnmountCdrom(std::string Path);

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index f6f2a3c1d7e5a46c19b90b23e1c141c40903874e..4c2e750413852e32586b73410452d78bded66d04 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -34,6 +34,10 @@
 #include <vector>
 #include <iostream>
 
 #include <vector>
 #include <iostream>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 class Configuration
 {
    public:
 class Configuration
 {
    public:

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index f96dc72dcbd7961d1ffe5fc48fae41278d26a2ff..8a986b82b805fce6129d251a347ea4c2009291ac 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -29,6 +29,10 @@
 
 #include <zlib.h>
 
 
 #include <zlib.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 /* Define this for python-apt */
 #define APT_HAS_GZIP 1
 
 /* Define this for python-apt */
 #define APT_HAS_GZIP 1
 

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 81851dedeb2d3b0f47c6de3a9f06ccedf24394c4..b206eccb81ff1cc1d786565a28f4b63f96251872 100644 (file)
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -22,6 +22,12 @@
 #include <vector>
 #include <cstring>
 
 #include <vector>
 #include <cstring>
 

+
+#ifndef APT_8_CLEANER_HEADERS
+using std::min;
+using std::vector;
+#endif
+

 // helper class that contains hash function name
 // and hash
 class HashString
 // helper class that contains hash function name
 // and hash
 class HashString

diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
index 27d192b82ad92e61c3226bd2b00d30961ed928ad..6301ac9d0aca324c967a77ac62767ce4c36bfb5b 100644 (file)
--- a/apt-pkg/contrib/hashsum_template.h
+++ b/apt-pkg/contrib/hashsum_template.h
@@ -15,6 +15,11 @@
 #include <algorithm>
 #include <stdint.h>
 
 #include <algorithm>
 #include <stdint.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::min;
+#endif
+

 template<int N>
 class HashSumValue
 {
 template<int N>
 class HashSumValue
 {

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index a207da4e4f8d6615379549cf900f1d8ea4cfbe8e..25631b1668058749ba0dc7e93e729e055f3e6ea1 100644 (file)
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -31,6 +31,11 @@
 
 #include "hashsum_template.h"
 
 
 #include "hashsum_template.h"
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::min;
+#endif
+

 typedef HashSumValue<128> MD5SumValue;
 
 class MD5Summation : public SummationImplementation
 typedef HashSumValue<128> MD5SumValue;
 
 class MD5Summation : public SummationImplementation

diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index 2ed4a95f8be576335b30cdc796911b3ebd3a9c90..602de94f8fffca140504d99a5d7ead27aedf5653 100644 (file)
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -28,6 +28,10 @@
 
 #include <string>
 
 
 #include <string>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 class FileFd;
 
 /* This should be a 32 bit type, larger tyes use too much ram and smaller
 class FileFd;
 
 /* This should be a 32 bit type, larger tyes use too much ram and smaller

diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 7635719bc348a4a08d8eb5d64d9a87c6f287c784..3a6943aee5731325a70b1913b3a29aabc0fab76a 100644 (file)
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -25,6 +25,10 @@
 #include <string>
 #include <sys/time.h>
 
 #include <string>
 #include <sys/time.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 class Configuration;
 class OpProgress
 {
 class Configuration;
 class OpProgress
 {

diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index b4b139a222bdf2194b69a15356e257842aa3e072..a8d55eb13d5a77e5f2e5fd0313ae48be29bab47d 100644 (file)
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -20,6 +20,11 @@
 
 #include "hashsum_template.h"
 
 
 #include "hashsum_template.h"
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::min;
+#endif
+

 typedef  HashSumValue<160> SHA1SumValue;
 
 class SHA1Summation : public SummationImplementation
 typedef  HashSumValue<160> SHA1SumValue;
 
 class SHA1Summation : public SummationImplementation

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 93f4bef4f383cb04e923199cbaaa969607de0910..337139d5d53050ff746221f23d2e714ef54da590 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -27,6 +27,12 @@
 
 #include "macros.h"
 
 
 #include "macros.h"
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::vector;
+using std::ostream;
+#endif
+

 bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
 char *_strstrip(char *String);
 char *_strtabexpand(char *String,size_t Len);
 bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
 char *_strstrip(char *String);
 char *_strtabexpand(char *String,size_t Len);

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 6b62360b7a14797a440eab7054b11153aed00c80..aab39f633a9a1e4c3a5018102d939899deadb98c 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -15,6 +15,11 @@
 #include <map>
 #include <stdio.h>
 
 #include <map>
 #include <stdio.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::vector;
+using std::map;
+#endif
+

 class pkgDPkgPMPrivate;
 
 class pkgDPkgPM : public pkgPackageManager
 class pkgDPkgPMPrivate;
 
 class pkgDPkgPM : public pkgPackageManager

diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 21294ae7ed29ee49ded2a6089c1477b03c6a0da6..e3de1afd97f1f6454d1a20ec43bd8802fadbc164 100644 (file)
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -14,6 +14,11 @@
 #include <string>
 #include <stdio.h>
 
 #include <string>
 #include <stdio.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::vector;
+#endif
+

 class pkgTagSection;
 class FileFd;
 class indexRecords;
 class pkgTagSection;
 class FileFd;
 class indexRecords;

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 5e162a846847e1e020f643e55177e9bb7cc72d1d..1d34dc773bb3123cfef7681d76dc45b96568e93b 100644 (file)
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -29,6 +29,10 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/macros.h>
 
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/macros.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 class pkgAcquire;
 class pkgCacheGenerator;
 class OpProgress;
 class pkgAcquire;
 class pkgCacheGenerator;
 class OpProgress;

diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 9cc79a7a62a43f0e041d6803361ce2d7eecaf1df..0f95257e07ee41e116acef75e7ba3134db3df7d2 100644 (file)
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -6,6 +6,10 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/indexfile.h>
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/indexfile.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 class pkgAcquire;
 class pkgCacheGenerator;
 class OpProgress;
 class pkgAcquire;
 class pkgCacheGenerator;
 class OpProgress;

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index d4989a6e04e3ef4ad6e11163a697c427571e1b07..1d807795d30f4f74cd35ced50f3fd0ab44359d5e 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -29,6 +29,10 @@
 #include <iostream>
 #include <set>
 
 #include <iostream>
 #include <set>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 class pkgAcquire;
 class pkgDepCache;
 class pkgSourceList;
 class pkgAcquire;
 class pkgDepCache;
 class pkgSourceList;

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index fd1a021492b8c64ad3843fe4c514f90783d01151..1a7013551a5c9c57ae7a7733277e076042ba017e 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -74,11 +74,14 @@
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 

-

 #include <string>
 #include <time.h>
 #include <apt-pkg/mmap.h>
 
 #include <string>
 #include <time.h>
 #include <apt-pkg/mmap.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 class pkgVersioningSystem;
 class pkgCache                                                         /*{{{*/
 {
 class pkgVersioningSystem;
 class pkgCache                                                         /*{{{*/
 {

diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 3c8246e3b179efc3884924678401b4d70a7a2394..5172a3c3b9419b5759e8ea701d503c659984c6c5 100644 (file)
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -38,6 +38,10 @@
 #include <apt-pkg/versionmatch.h>
 #include <vector>
 
 #include <apt-pkg/versionmatch.h>
 #include <vector>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::vector;
+#endif
+

 class pkgPolicy : public pkgDepCache::Policy
 {
    protected:
 class pkgPolicy : public pkgDepCache::Policy
 {
    protected:

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index a55bc74fa2cd2c94d63c2958a21bdb05d371514e..06f0dce6c02ff5a8fbc94d4b999e4646919522ca 100644 (file)
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -17,6 +17,11 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::vector;
+#endif
+

 class pkgSourceList;
 class pkgIndexFile;
 class pkgSrcRecords
 class pkgSourceList;
 class pkgIndexFile;
 class pkgSrcRecords

diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h
index 9b157378cc47d63c2d4f8fe269ecc7cb27fb0810..6484adf9b0e54845a0cec03a53164ba30b081721 100644 (file)
--- a/apt-pkg/vendor.h
+++ b/apt-pkg/vendor.h
@@ -6,6 +6,10 @@
 
 #include <apt-pkg/macros.h>
 
 
 #include <apt-pkg/macros.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 // A class representing a particular software provider.
 class __deprecated Vendor
 {
 // A class representing a particular software provider.
 class __deprecated Vendor
 {

diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index 733d23a320ac239e12d242ee8dd69c5b1e144df8..4e050477f039e9a1ae2c30d407d36a8b32609cca 100644 (file)
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -17,6 +17,11 @@
 #include <vector>
 #include <apt-pkg/macros.h>
 
 #include <vector>
 #include <apt-pkg/macros.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::vector;
+#endif
+

 class Vendor;
 class Configuration;
 
 class Vendor;
 class Configuration;
 

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 92dbc2576732edde7bd8c17bdf3375f000b8c185..e0e0e6c1410f87f86d1aa41527306bc3c4ea907f 100644 (file)
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -23,6 +23,10 @@
 #include <apt-pkg/strutl.h>
 #include <string>
 
 #include <apt-pkg/strutl.h>
 #include <string>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 class pkgVersioningSystem
 {
    public:
 class pkgVersioningSystem
 {
    public:

diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index da103fc5b5fec0c438e3afc1b5523ea04a2a7a79..433396fc957885d6aa18ef5069dd31ec60f410ed 100644 (file)
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -39,6 +39,10 @@
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 class pkgVersionMatch
 {   
    // Version Matching
 class pkgVersionMatch
 {   
    // Version Matching