merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

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

diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index a8da072ae078e039ce8dafd9004ec8183eca9fb7..433396fc957885d6aa18ef5069dd31ec60f410ed 100644 (file)
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -39,38 +39,42 @@
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::string;
 using std::string;

+#endif

 
 class pkgVersionMatch
 {   
    // Version Matching
 
 class pkgVersionMatch
 {   
    // Version Matching

-   string VerStr;
+   std::string VerStr;

    bool VerPrefixMatch;
 
    // Release Matching
    bool VerPrefixMatch;
 
    // Release Matching

-   string RelVerStr;
+   std::string RelVerStr;

    bool RelVerPrefixMatch;
    bool RelVerPrefixMatch;

-   string RelOrigin;
-   string RelRelease;
-   string RelCodename;
-   string RelArchive;
-   string RelLabel;
-   string RelComponent;
-   string RelArchitecture;
+   std::string RelOrigin;
+   std::string RelRelease;
+   std::string RelCodename;
+   std::string RelArchive;
+   std::string RelLabel;
+   std::string RelComponent;
+   std::string RelArchitecture;

    bool MatchAll;
    
    // Origin Matching
    bool MatchAll;
    
    // Origin Matching

-   string OrSite;
+   std::string OrSite;

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

-   bool MatchVer(const char *A,string B,bool Prefix);
+   bool MatchVer(const char *A,std::string B,bool Prefix);
+   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 FileMatch(pkgCache::PkgFileIterator File);
    pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);
                               

-   pkgVersionMatch(string Data,MatchType Type);
+   pkgVersionMatch(std::string Data,MatchType Type);

 };
 
 #endif
 };
 
 #endif