projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines
[apt.git]
/
apt-pkg
/
metaindex.h
diff --git
a/apt-pkg/metaindex.h
b/apt-pkg/metaindex.h
index 779b6ab141e8cc8fdb3faff8f73c6917ff3977e5..5783735ff32e9925247c699438cdcc38ec423299 100644
(file)
--- a/
apt-pkg/metaindex.h
+++ b/
apt-pkg/metaindex.h
@@
-4,12
+4,14
@@
#include <string>
#include <apt-pkg/pkgcache.h>
#include <string>
#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/indexfile.h>
+
+#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/indexfile.h>
#include <apt-pkg/vendor.h>
#include <apt-pkg/vendor.h>
-
using std::string;
using std::string;
+#endif
class pkgAcquire;
class pkgCacheGenerator;
class pkgAcquire;
class pkgCacheGenerator;
@@
-18,31
+20,35
@@
class OpProgress;
class metaIndex
{
protected:
class metaIndex
{
protected:
- vector <pkgIndexFile *> *Indexes;
+
std::
vector <pkgIndexFile *> *Indexes;
const char *Type;
const char *Type;
- string URI;
- string Dist;
+ st
d::st
ring URI;
+ st
d::st
ring Dist;
bool Trusted;
public:
// Various accessors
bool Trusted;
public:
// Various accessors
- virtual string GetURI() const {return URI;}
- virtual string GetDist() const {return Dist;}
+ virtual st
d::st
ring GetURI() const {return URI;}
+ virtual st
d::st
ring GetDist() const {return Dist;}
virtual const char* GetType() const {return Type;}
// Interface for acquire
virtual const char* GetType() const {return Type;}
// Interface for acquire
- virtual st
ring ArchiveURI(string
/*File*/) const = 0;
- virtual bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const = 0;
+ virtual st
d::string ArchiveURI(std::string const&
/*File*/) const = 0;
+ virtual bool GetIndexes(pkgAcquire *Owner, bool
const &
GetAll=false) const = 0;
- virtual vector<pkgIndexFile *> *GetIndexFiles() = 0;
+ virtual
std::
vector<pkgIndexFile *> *GetIndexFiles() = 0;
virtual bool IsTrusted() const = 0;
virtual bool IsTrusted() const = 0;
+ metaIndex(std::string const &URI, std::string const &Dist, char const * const Type) :
+ Indexes(NULL), Type(Type), URI(URI), Dist(Dist) {
+ }
+
virtual ~metaIndex() {
if (Indexes == 0)
return;
virtual ~metaIndex() {
if (Indexes == 0)
return;
- for (vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I)
+ for (
std::
vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I)
delete *I;
delete Indexes;
}
delete *I;
delete Indexes;
}