summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib/strutl.h
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-12-13 00:54:37 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-12-13 00:54:37 +0100
commita4f6bdc8bd91c7282ae9ac60c44844c6f0058a65 (patch)
treee72c9cda1f1b29c9bf0744c2ebf04c43d7b22500 /apt-pkg/contrib/strutl.h
parent699b209e5122f8fcd85fc4666c9b7020286ab0d0 (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/contrib/strutl.h')
-rw-r--r--apt-pkg/contrib/strutl.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 93f4bef4f..337139d5d 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -27,6 +27,12 @@
#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);