HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge EDSP 0.5 w/ multi-arch support for external solvers
[ntk/apt.git]
/
apt-pkg
/
indexrecords.h
diff --git
a/apt-pkg/indexrecords.h
b/apt-pkg/indexrecords.h
index
5b532c1
..
e31f889
100644
(file)
--- a/
apt-pkg/indexrecords.h
+++ b/
apt-pkg/indexrecords.h
@@
-5,55
+5,61
@@
#ifndef PKGLIB_INDEXRECORDS_H
#define PKGLIB_INDEXRECORDS_H
#ifndef PKGLIB_INDEXRECORDS_H
#define PKGLIB_INDEXRECORDS_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>
+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
+#endif
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/pkgcache.h>
+#endif
class indexRecords
{
class indexRecords
{
- bool parseSumData(const char *&Start, const char *End, string &Name,
- st
ring &Hash, size_t
&Size);
+ bool parseSumData(const char *&Start, const char *End, st
d::st
ring &Name,
+ st
d::string &Hash, unsigned long long
&Size);
public:
struct checkSum;
public:
struct checkSum;
- string ErrorText;
+ st
d::st
ring ErrorText;
protected:
protected:
- string Dist;
- string Suite;
- string ExpectedDist;
+ st
d::st
ring Dist;
+ st
d::st
ring Suite;
+ st
d::st
ring ExpectedDist;
time_t ValidUntil;
time_t ValidUntil;
- std::map<string,checkSum *> Entries;
+ std::map<st
d::st
ring,checkSum *> Entries;
public:
indexRecords();
public:
indexRecords();
- indexRecords(const string ExpectedDist);
+ indexRecords(const st
d::st
ring ExpectedDist);
// Lookup function
// Lookup function
- virtual const checkSum *Lookup(const string MetaKey);
+ virtual const checkSum *Lookup(const st
d::st
ring 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(st
d::st
ring 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;
+ std::string GetSuite() const;
time_t GetValidUntil() const;
time_t GetValidUntil() const;
- virtual bool CheckDist(const string MaybeDist) const;
- string GetExpectedDist() const;
+ virtual bool CheckDist(const st
d::st
ring MaybeDist) const;
+ st
d::st
ring GetExpectedDist() const;
virtual ~indexRecords(){};
};
struct indexRecords::checkSum
{
virtual ~indexRecords(){};
};
struct indexRecords::checkSum
{
- string MetaKeyFilename;
+ st
d::st
ring MetaKeyFilename;
HashString Hash;
HashString Hash;
- size_t Size;
+ unsigned long long Size;
};
#endif
};
#endif