summaryrefslogtreecommitdiff
path: root/apt-pkg/srcrecords.h
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2012-04-16 19:24:07 +0200
committerMichael Vogt <egon@debian-devbox>2012-04-16 19:24:07 +0200
commit443f5e8a3205162ec6933529c5ca0c95ad3f6941 (patch)
tree3e2da22dcecc8eeaabc1ac5ceac0407a8e3cc25f /apt-pkg/srcrecords.h
parent96273866174c54bdb25813633891f29668d43848 (diff)
parentf352743312edeebf666e1c8304cdc4baf457469f (diff)
merge from the expermental2 branch
Diffstat (limited to 'apt-pkg/srcrecords.h')
-rw-r--r--apt-pkg/srcrecords.h36
1 files changed, 20 insertions, 16 deletions
diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index a49533864..06f0dce6c 100644
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -15,10 +15,12 @@
#include <string>
-#include <vector>
+#include <vector>
+#ifndef APT_8_CLEANER_HEADERS
using std::string;
using std::vector;
+#endif
class pkgSourceList;
class pkgIndexFile;
@@ -29,10 +31,10 @@ class pkgSrcRecords
// Describes a single file
struct File
{
- string MD5Hash;
+ std::string MD5Hash;
unsigned long Size;
- string Path;
- string Type;
+ std::string Path;
+ std::string Type;
};
// Abstract parser for each source record
@@ -49,8 +51,8 @@ class pkgSrcRecords
struct BuildDepRec
{
- string Package;
- string Version;
+ std::string Package;
+ std::string Version;
unsigned int Op;
unsigned char Type;
};
@@ -61,28 +63,30 @@ class pkgSrcRecords
virtual bool Step() = 0;
virtual bool Jump(unsigned long const &Off) = 0;
virtual unsigned long Offset() = 0;
- virtual string AsStr() = 0;
+ virtual std::string AsStr() = 0;
- virtual string Package() const = 0;
- virtual string Version() const = 0;
- virtual string Maintainer() const = 0;
- virtual string Section() const = 0;
+ virtual std::string Package() const = 0;
+ virtual std::string Version() const = 0;
+ virtual std::string Maintainer() const = 0;
+ virtual std::string Section() const = 0;
virtual const char **Binaries() = 0; // Ownership does not transfer
- virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;
+ virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;
static const char *BuildDepType(unsigned char const &Type);
- virtual bool Files(vector<pkgSrcRecords::File> &F) = 0;
+ virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;
Parser(const pkgIndexFile *Index) : iIndex(Index) {};
virtual ~Parser() {};
};
private:
+ /** \brief dpointer placeholder (for later in case we need it) */
+ void *d;
// The list of files and the current parser pointer
- vector<Parser*> Files;
- vector<Parser *>::iterator Current;
+ std::vector<Parser*> Files;
+ std::vector<Parser *>::iterator Current;
public:
@@ -93,7 +97,7 @@ class pkgSrcRecords
Parser *Find(const char *Package,bool const &SrcOnly = false);
pkgSrcRecords(pkgSourceList &List);
- ~pkgSrcRecords();
+ virtual ~pkgSrcRecords();
};
#endif