diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2011-12-13 00:54:37 +0100 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-12-13 00:54:37 +0100 |
commit | a4f6bdc8bd91c7282ae9ac60c44844c6f0058a65 (patch) | |
tree | e72c9cda1f1b29c9bf0744c2ebf04c43d7b22500 /apt-pkg/pkgcache.h | |
parent | 699b209e5122f8fcd85fc4666c9b7020286ab0d0 (diff) |
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
Diffstat (limited to 'apt-pkg/pkgcache.h')
-rw-r--r-- | apt-pkg/pkgcache.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index fd1a02149..1a7013551 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -74,11 +74,14 @@ #ifndef PKGLIB_PKGCACHE_H #define PKGLIB_PKGCACHE_H - #include <string> #include <time.h> #include <apt-pkg/mmap.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class pkgVersioningSystem; class pkgCache /*{{{*/ { |