Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental

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

diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index da103fc5b5fec0c438e3afc1b5523ea04a2a7a79..4c8f704c861e3da8b56c9643785fcd254e9c4a54 100644 (file)
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -35,12 +35,17 @@
 #ifndef PKGLIB_VERSIONMATCH_H
 #define PKGLIB_VERSIONMATCH_H
 
 #ifndef PKGLIB_VERSIONMATCH_H
 #define PKGLIB_VERSIONMATCH_H
 

+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>

 
 #include <string>
 
 #include <string>

-#include <apt-pkg/pkgcache.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif

 
 class pkgVersionMatch
 
 class pkgVersionMatch

-{   
+{

    // Version Matching
    std::string VerStr;
    bool VerPrefixMatch;
    // Version Matching
    std::string VerStr;
    bool VerPrefixMatch;


@@ -56,20 +61,20 @@ class pkgVersionMatch
    std::string RelComponent;
    std::string RelArchitecture;
    bool MatchAll;
    std::string RelComponent;
    std::string RelArchitecture;
    bool MatchAll;

-   
+

    // Origin Matching
    std::string OrSite;
    // Origin Matching
    std::string OrSite;

-   
+

    public:
    public:

-   
+

    enum MatchType {None = 0,Version,Release,Origin} Type;
    enum MatchType {None = 0,Version,Release,Origin} Type;

-   
-   bool MatchVer(const char *A,std::string B,bool Prefix);
+
+   bool MatchVer(const char *A,std::string B,bool Prefix) APT_PURE;

    bool ExpressionMatches(const char *pattern, const char *string);
    bool ExpressionMatches(const std::string& pattern, const char *string);
    bool FileMatch(pkgCache::PkgFileIterator File);
    pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);
    bool ExpressionMatches(const char *pattern, const char *string);
    bool ExpressionMatches(const std::string& pattern, const char *string);
    bool FileMatch(pkgCache::PkgFileIterator File);
    pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);

-                              
+

    pkgVersionMatch(std::string Data,MatchType Type);
 };
 
    pkgVersionMatch(std::string Data,MatchType Type);
 };