remove incorrect optimization branches

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

diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index d07337d387d216b180fc1798c38961fa2a840e9d..f4cadf5e6ad1f46ab6c0940fc876d60c886de250 100644 (file)
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cachefile.h,v 1.5 2002/04/27 04:28:04 jgg Exp $

 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot
 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot


@@ -17,19 +16,31 @@
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 

+#include <stddef.h>

 
 #include <apt-pkg/depcache.h>
 
 #include <apt-pkg/depcache.h>

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

 #include <apt-pkg/acquire.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/sourcelist.h>

+#endif
+
+class MMap;
+class pkgPolicy;
+class pkgSourceList;
+class OpProgress;

 
 class pkgCacheFile
 {
    /** \brief dpointer placeholder (for later in case we need it) */
 
 class pkgCacheFile
 {
    /** \brief dpointer placeholder (for later in case we need it) */

-   void *d;
+   void * const d;
+   bool ExternOwner;

 
    protected:
 
    protected:

-   

    MMap *Map;
    pkgCache *Cache;
    pkgDepCache *DCache;
    MMap *Map;
    pkgCache *Cache;
    pkgDepCache *DCache;


@@ -39,27 +50,28 @@ class pkgCacheFile
    pkgPolicy *Policy;
 
    // We look pretty much exactly like a pointer to a dep cache
    pkgPolicy *Policy;
 
    // We look pretty much exactly like a pointer to a dep cache

-   inline operator pkgCache &() {return *Cache;};
-   inline operator pkgCache *() {return Cache;};
-   inline operator pkgDepCache &() {return *DCache;};
-   inline operator pkgDepCache *() {return DCache;};
-   inline operator pkgPolicy &() {return *Policy;};
-   inline operator pkgPolicy *() {return Policy;};
-   inline operator pkgSourceList &() {return *SrcList;};
-   inline operator pkgSourceList *() {return SrcList;};
-   inline pkgDepCache *operator ->() {return DCache;};
-   inline pkgDepCache &operator *() {return *DCache;};
-   inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) {return (*DCache)[I];};
-   inline unsigned char &operator [](pkgCache::DepIterator const &I) {return (*DCache)[I];};
+   inline operator pkgCache &() const {return *Cache;};
+   inline operator pkgCache *() const {return Cache;};
+   inline operator pkgDepCache &() const {return *DCache;};
+   inline operator pkgDepCache *() const {return DCache;};
+   inline operator pkgPolicy &() const {return *Policy;};
+   inline operator pkgPolicy *() const {return Policy;};
+   inline operator pkgSourceList &() const {return *SrcList;};
+   inline operator pkgSourceList *() const {return SrcList;};
+   inline pkgDepCache *operator ->() const {return DCache;};
+   inline pkgDepCache &operator *() const {return *DCache;};
+   inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) const {return (*DCache)[I];};
+   inline unsigned char &operator [](pkgCache::DepIterator const &I) const {return (*DCache)[I];};

 
    bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true);
 
    bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true);

-   __deprecated bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); };
+   APT_DEPRECATED bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); };

    bool BuildSourceList(OpProgress *Progress = NULL);
    bool BuildPolicy(OpProgress *Progress = NULL);
    bool BuildDepCache(OpProgress *Progress = NULL);
    bool Open(OpProgress *Progress = NULL, bool WithLock = true);
    inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); };
    bool BuildSourceList(OpProgress *Progress = NULL);
    bool BuildPolicy(OpProgress *Progress = NULL);
    bool BuildDepCache(OpProgress *Progress = NULL);
    bool Open(OpProgress *Progress = NULL, bool WithLock = true);
    inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); };

-   __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };
+   APT_DEPRECATED bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };
+   static void RemoveCaches();

    void Close();
 
    inline pkgCache* GetPkgCache() { BuildCaches(NULL, false); return Cache; };
    void Close();
 
    inline pkgCache* GetPkgCache() { BuildCaches(NULL, false); return Cache; };


@@ -73,6 +85,7 @@ class pkgCacheFile
    inline bool IsSrcListBuilt() const { return (SrcList != NULL); };
 
    pkgCacheFile();
    inline bool IsSrcListBuilt() const { return (SrcList != NULL); };
 
    pkgCacheFile();

+   explicit pkgCacheFile(pkgDepCache * const Owner);

    virtual ~pkgCacheFile();
 };
 
    virtual ~pkgCacheFile();
 };