fix some more ABI issues, abicheck is happy now

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

diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index fe264aa463688ff9cfa47f79225bf8345eb988cc..433396fc957885d6aa18ef5069dd31ec60f410ed 100644 (file)
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -3,29 +3,33 @@
 // $Id: versionmatch.h,v 1.4 2001/05/29 03:07:12 jgg Exp $
 /* ######################################################################
 
 // $Id: versionmatch.h,v 1.4 2001/05/29 03:07:12 jgg Exp $
 /* ######################################################################
 

-   Version Matching 
-   
+   Version Matching
+

    This module takes a matching string and a type and locates the version
    record that satisfies the constraint described by the matching string.
 
      Version: 1.2*
      Release: o=Debian,v=2.1*,c=main
      Release: v=2.1*
    This module takes a matching string and a type and locates the version
    record that satisfies the constraint described by the matching string.
 
      Version: 1.2*
      Release: o=Debian,v=2.1*,c=main
      Release: v=2.1*

+     Release: a=testing
+     Release: n=squeeze

      Release: *
      Origin: ftp.debian.org
      Release: *
      Origin: ftp.debian.org

-   
+

    Release may be a complex type that can specify matches for any of:
       Version (v= with prefix)
       Origin (o=)
    Release may be a complex type that can specify matches for any of:
       Version (v= with prefix)
       Origin (o=)

-      Archive (a=)
+      Archive (a=) eg, unstable, testing, stable
+      Codename (n=) e.g. etch, lenny, squeeze, sid

       Label (l=)
       Component (c=)
       Label (l=)
       Component (c=)

+      Binary Architecture (b=)

    If there are no equals signs in the string then it is scanned in short
    If there are no equals signs in the string then it is scanned in short

-   form - if it starts with a number it is Version otherwise it is an 
-   Archive.
-   
+   form - if it starts with a number it is Version otherwise it is an
+   Archive or a Codename.
+

    Release may be a '*' to match all releases.
    Release may be a '*' to match all releases.

-   
+

    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_VERSIONMATCH_H
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_VERSIONMATCH_H


@@ -35,35 +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 RelArchive;
-   string RelLabel;
-   string RelComponent;
+   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