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

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

diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 5cd5ea354fa353bf33fb4f7e9738d283f7bb35eb..0306861a1b4ea0399a09c008ce08e847a560ef88 100644 (file)
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -38,9 +38,6 @@
 #ifndef PKGLIB_DEPCACHE_H
 #define PKGLIB_DEPCACHE_H
 
 #ifndef PKGLIB_DEPCACHE_H
 #define PKGLIB_DEPCACHE_H
 

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

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


@@ -48,6 +45,7 @@
 #include <regex.h>
 
 #include <vector>
 #include <regex.h>
 
 #include <vector>

+#include <memory>

 
 class pkgDepCache : protected pkgCache::Namespace
 {
 
 class pkgDepCache : protected pkgCache::Namespace
 {


@@ -94,7 +92,7 @@ class pkgDepCache : protected pkgCache::Namespace
     *  \param rootFunc A callback that can be used to add extra
     *  packages to the root set.
     *
     *  \param rootFunc A callback that can be used to add extra
     *  packages to the root set.
     *

-    *  \return \b false if an error occured.
+    *  \return \b false if an error occurred.

     */
    bool MarkRequired(InRootSetFunc &rootFunc);
 
     */
    bool MarkRequired(InRootSetFunc &rootFunc);
 


@@ -105,7 +103,7 @@ class pkgDepCache : protected pkgCache::Namespace
     *  are tested to see whether they are actually garbage.  If so,
     *  they are marked as such.
     *
     *  are tested to see whether they are actually garbage.  If so,
     *  they are marked as such.
     *

-    *  \return \b false if an error occured.
+    *  \return \b false if an error occurred.

     */
    bool Sweep();
 
     */
    bool Sweep();
 


@@ -296,7 +294,10 @@ class pkgDepCache : protected pkgCache::Namespace
    unsigned long iBrokenCount;
    unsigned long iPolicyBrokenCount;
    unsigned long iBadCount;
    unsigned long iBrokenCount;
    unsigned long iPolicyBrokenCount;
    unsigned long iBadCount;

-   
+
+   bool DebugMarker;
+   bool DebugAutoInstall;
+

    Policy *delLocalPolicy;           // For memory clean up..
    Policy *LocalPolicy;
    
    Policy *delLocalPolicy;           // For memory clean up..
    Policy *LocalPolicy;
    


@@ -389,24 +390,64 @@ class pkgDepCache : protected pkgCache::Namespace
     */
    // @{
    void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
     */
    // @{
    void MarkKeep(PkgIterator const &Pkg, bool Soft = false,

-                bool FromUser = true);
-   void MarkDelete(PkgIterator const &Pkg,bool Purge = false);
+                bool FromUser = true, unsigned long Depth = 0);
+   void MarkDelete(PkgIterator const &Pkg, bool Purge = false,
+                   unsigned long Depth = 0, bool FromUser = true);

    void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
                    unsigned long Depth = 0, bool FromUser = true,
                    bool ForceImportantDeps = false);
    void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
                    unsigned long Depth = 0, bool FromUser = true,
                    bool ForceImportantDeps = false);

+

    void SetReInstall(PkgIterator const &Pkg,bool To);
    void SetCandidateVersion(VerIterator TargetVer);
 
    /** Set the "is automatically installed" flag of Pkg. */
    void MarkAuto(const PkgIterator &Pkg, bool Auto);
    // @}
    void SetReInstall(PkgIterator const &Pkg,bool To);
    void SetCandidateVersion(VerIterator TargetVer);
 
    /** Set the "is automatically installed" flag of Pkg. */
    void MarkAuto(const PkgIterator &Pkg, bool Auto);
    // @}

-   
+
+   /** \return \b true if it's OK for MarkInstall to install
+    *  the given package.
+    *
+    *  See the default implementation for a simple example how this
+    *  method can be used.
+    *  Overriding implementations should use the hold-state-flag to cache
+    *  results from previous checks of this package - also it should
+    *  be used if the default resolver implementation is also used to
+    *  ensure that these packages are handled like "normal" dpkg holds.
+    *
+    *  The parameters are the same as in the calling MarkInstall:
+    *  \param Pkg       the package that MarkInstall wants to install.
+    *  \param AutoInst  needs a previous MarkInstall this package?
+    *  \param Depth     recursive deep of this Marker call
+    *  \param FromUser  was the install requested by the user?
+    */
+   virtual bool IsInstallOk(const PkgIterator &Pkg,bool AutoInst = true,
+                           unsigned long Depth = 0, bool FromUser = true);
+
+   /** \return \b true if it's OK for MarkDelete to remove
+    *  the given package.
+    *
+    *  See the default implementation for a simple example how this
+    *  method can be used.
+    *  Overriding implementations should use the hold-state-flag to cache
+    *  results from previous checks of this package - also it should
+    *  be used if the default resolver implementation is also used to
+    *  ensure that these packages are handled like "normal" dpkg holds.
+    *
+    *  The parameters are the same as in the calling MarkDelete:
+    *  \param Pkg       the package that MarkDelete wants to remove.
+    *  \param Purge     should we purge instead of "only" remove?
+    *  \param Depth     recursive deep of this Marker call
+    *  \param FromUser  was the remove requested by the user?
+    */
+   virtual bool IsDeleteOk(const PkgIterator &Pkg,bool Purge = false,
+                           unsigned long Depth = 0, bool FromUser = true);
+

    // This is for debuging
    void Update(OpProgress *Prog = 0);
 
    // read persistent states
    bool readStateFile(OpProgress *prog);
    // This is for debuging
    void Update(OpProgress *Prog = 0);
 
    // read persistent states
    bool readStateFile(OpProgress *prog);

-   bool writeStateFile(OpProgress *prog);
+   bool writeStateFile(OpProgress *prog, bool InstalledOnly=false);

    
    // Size queries
    inline double UsrSize() {return iUsrSize;};
    
    // Size queries
    inline double UsrSize() {return iUsrSize;};