Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / acquire-method.h

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index f0f2a537a6ed6e35b94c5f03dd4a2550f941e0c8..cbf79f8609be84b6d72e204e983095696f1ce258 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -20,6 +20,9 @@
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 

+#include <apt-pkg/hashes.h>
+#include <apt-pkg/macros.h>
+

 #include <stdarg.h>
 #include <time.h>
 
 #include <stdarg.h>
 #include <time.h>
 


@@ -31,7 +34,6 @@
 #include <apt-pkg/strutl.h>
 #endif
 
 #include <apt-pkg/strutl.h>
 #endif
 

-class Hashes;

 class pkgAcqMethod
 {
    protected:
 class pkgAcqMethod
 {
    protected:


@@ -45,14 +47,12 @@ class pkgAcqMethod
       time_t LastModified;
       bool IndexFile;
       bool FailIgnore;
       time_t LastModified;
       bool IndexFile;
       bool FailIgnore;

+      HashStringList ExpectedHashes;

    };
    
    struct FetchResult
    {
    };
    
    struct FetchResult
    {

-      std::string MD5Sum;
-      std::string SHA1Sum;
-      std::string SHA256Sum;
-      std::string SHA512Sum;
+      HashStringList Hashes;

       std::vector<std::string> GPGVOutput;
       time_t LastModified;
       bool IMSHit;
       std::vector<std::string> GPGVOutput;
       time_t LastModified;
       bool IMSHit;


@@ -60,7 +60,7 @@ class pkgAcqMethod
       unsigned long long Size;
       unsigned long long ResumePoint;
       
       unsigned long long Size;
       unsigned long long ResumePoint;
       

-      void TakeHashes(Hashes &Hash);
+      void TakeHashes(class Hashes &Hash);

       FetchResult();
    };
 
       FetchResult();
    };
 


@@ -107,7 +107,7 @@ class pkgAcqMethod
    virtual ~pkgAcqMethod() {};
 
    private:
    virtual ~pkgAcqMethod() {};
 
    private:

-   void Dequeue();
+   APT_HIDDEN void Dequeue();

 };
 
 /** @} */
 };
 
 /** @} */