diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-12-19 14:07:51 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-12-19 14:07:51 +0100 |
commit | 27da8141d21cfbfc29675510737ee05bdfd4a2b1 (patch) | |
tree | 008e311e4c24dbfce3f47643d962cfa67a333a68 /apt-pkg/contrib/strutl.h | |
parent | 386566e36bedb453eb6f914e8e14fd555a2bf111 (diff) | |
parent | 6fd947bd48449652edf783cfb1362391e63f9be1 (diff) |
merged from lp:~donkult/apt/experimental
Diffstat (limited to 'apt-pkg/contrib/strutl.h')
-rw-r--r-- | apt-pkg/contrib/strutl.h | 6 |
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); |