projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged r1970 lp:~vorlon/apt/lp.968828
[apt.git]
/
apt-pkg
/
indexfile.h
diff --git
a/apt-pkg/indexfile.h
b/apt-pkg/indexfile.h
index 2b5ae63427f8d28428c64f36ac6ad5202d701cb9..1d34dc773bb3123cfef7681d76dc45b96568e93b 100644
(file)
--- a/
apt-pkg/indexfile.h
+++ b/
apt-pkg/indexfile.h
@@
-27,12
+27,16
@@
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/pkgrecords.h>
-
+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
using std::string;
using std::string;
+#endif
class pkgAcquire;
class pkgCacheGenerator;
class OpProgress;
class pkgAcquire;
class pkgCacheGenerator;
class OpProgress;
+
class pkgIndexFile
{
protected:
class pkgIndexFile
{
protected:
@@
-59,13
+63,13
@@
class pkgIndexFile
virtual const Type *GetType() const = 0;
// Return descriptive strings of various sorts
virtual const Type *GetType() const = 0;
// Return descriptive strings of various sorts
- virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;
- virtual string SourceInfo(pkgSrcRecords::Parser const &Record,
+ virtual st
d::st
ring ArchiveInfo(pkgCache::VerIterator Ver) const;
+ virtual st
d::st
ring SourceInfo(pkgSrcRecords::Parser const &Record,
pkgSrcRecords::File const &File) const;
pkgSrcRecords::File const &File) const;
- virtual string Describe(bool Short = false) const = 0;
+ virtual st
d::st
ring Describe(bool Short = false) const = 0;
// Interface for acquire
// Interface for acquire
- virtual st
ring ArchiveURI(string /*File*/) const {return
string();};
+ virtual st
d::string ArchiveURI(std::string /*File*/) const {return std::
string();};
// Interface for the record parsers
virtual pkgSrcRecords::Parser *CreateSrcParser() const {return 0;};
// Interface for the record parsers
virtual pkgSrcRecords::Parser *CreateSrcParser() const {return 0;};
@@
-84,7
+88,7
@@
class pkgIndexFile
static bool TranslationsAvailable();
static bool CheckLanguageCode(const char *Lang);
static bool TranslationsAvailable();
static bool CheckLanguageCode(const char *Lang);
- static string LanguageCode();
+ static st
d::st
ring LanguageCode();
bool IsTrusted() const { return Trusted; };
bool IsTrusted() const { return Trusted; };