fix partial (206 and 416) support in https

[apt.git] / apt-pkg / indexrecords.h

diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 0f933b93caa75d0f8ce7fcff19d58566428db56d..a98b939bc69476f1514f20f6054082cd01490a20 100644 (file)
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -7,51 +7,54 @@
 
 
 #include <apt-pkg/pkgcache.h>
 
 
 #include <apt-pkg/pkgcache.h>

-#include <apt-pkg/fileutl.h>

 #include <apt-pkg/hashes.h>
 
 #include <map>
 #include <vector>
 #include <ctime>
 
 #include <apt-pkg/hashes.h>
 
 #include <map>
 #include <vector>
 #include <ctime>
 

+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
+#endif
+

 class indexRecords
 {
 class indexRecords
 {

-   bool parseSumData(const char *&Start, const char *End, string &Name,
-                    string &Hash, unsigned long long &Size);
+   bool parseSumData(const char *&Start, const char *End, std::string &Name,
+                    std::string &Hash, unsigned long long &Size);

    public:
    struct checkSum;
    public:
    struct checkSum;

-   string ErrorText;
+   std::string ErrorText;

    
    protected:
    
    protected:

-   string Dist;
-   string Suite;
-   string ExpectedDist;
+   std::string Dist;
+   std::string Suite;
+   std::string ExpectedDist;

    time_t ValidUntil;
 
    time_t ValidUntil;
 

-   std::map<string,checkSum *> Entries;
+   std::map<std::string,checkSum *> Entries;

 
    public:
 
    indexRecords();
 
    public:
 
    indexRecords();

-   indexRecords(const string ExpectedDist);
+   indexRecords(const std::string ExpectedDist);

 
    // Lookup function
 
    // Lookup function

-   virtual const checkSum *Lookup(const string MetaKey);
+   virtual const checkSum *Lookup(const std::string MetaKey);

    /** \brief tests if a checksum for this file is available */
    /** \brief tests if a checksum for this file is available */

-   bool Exists(string const &MetaKey) const;
+   bool Exists(std::string const &MetaKey) const;

    std::vector<std::string> MetaKeys();
 
    std::vector<std::string> MetaKeys();
 

-   virtual bool Load(string Filename);
-   string GetDist() const;
+   virtual bool Load(std::string Filename);
+   std::string GetDist() const;

    time_t GetValidUntil() const;
    time_t GetValidUntil() const;

-   virtual bool CheckDist(const string MaybeDist) const;
-   string GetExpectedDist() const;
+   virtual bool CheckDist(const std::string MaybeDist) const;
+   std::string GetExpectedDist() const;

    virtual ~indexRecords(){};
 };
 
 struct indexRecords::checkSum
 {
    virtual ~indexRecords(){};
 };
 
 struct indexRecords::checkSum
 {

-   string MetaKeyFilename;
+   std::string MetaKeyFilename;

    HashString Hash;
    unsigned long long Size;
 };
    HashString Hash;
    unsigned long long Size;
 };