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/progress.h | |
parent | 386566e36bedb453eb6f914e8e14fd555a2bf111 (diff) | |
parent | 6fd947bd48449652edf783cfb1362391e63f9be1 (diff) |
merged from lp:~donkult/apt/experimental
Diffstat (limited to 'apt-pkg/contrib/progress.h')
-rw-r--r-- | apt-pkg/contrib/progress.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h index 7635719bc..3a6943aee 100644 --- a/apt-pkg/contrib/progress.h +++ b/apt-pkg/contrib/progress.h @@ -25,6 +25,10 @@ #include <string> #include <sys/time.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class Configuration; class OpProgress { |