Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index b4b139a222bdf2194b69a15356e257842aa3e072..a8d55eb13d5a77e5f2e5fd0313ae48be29bab47d 100644 (file)
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -20,6 +20,11 @@
 
 #include "hashsum_template.h"
 
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::min;
+#endif
+
 typedef  HashSumValue<160> SHA1SumValue;
 
 class SHA1Summation : public SummationImplementation