add a few gcc helpers, including [un]likely() and __deprecated

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

diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index f8f236a2f7d945c5318182311dddfcdc0490f5f3..a8f3c84ac9a8ab92fcb3fdb289510a3ea208c035 100644 (file)
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -1,45 +1,47 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: versionmatch.h,v 1.2 2001/02/20 07:03:17 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=)
    If there are no equals signs in the string then it is scanned in short
       Label (l=)
       Component (c=)
    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
 #define PKGLIB_VERSIONMATCH_H
 
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_VERSIONMATCH_H
 #define PKGLIB_VERSIONMATCH_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/versionmatch.h"
-#endif

 
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
 

+using std::string;
+

 class pkgVersionMatch
 class pkgVersionMatch

-{
+{   

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


@@ -48,10 +50,13 @@ class pkgVersionMatch
    string RelVerStr;
    bool RelVerPrefixMatch;
    string RelOrigin;
    string RelVerStr;
    bool RelVerPrefixMatch;
    string RelOrigin;

+   string RelRelease;
+   string RelCodename;

    string RelArchive;
    string RelLabel;
    string RelComponent;
    string RelArchive;
    string RelLabel;
    string RelComponent;

-
+   bool MatchAll;
+   

    // Origin Matching
    string OrSite;
    
    // Origin Matching
    string OrSite;