merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

[apt.git] / apt-pkg / contrib / progress.h

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
 {