do not inline virtual destructors with d-pointers

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

diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index 246762e0bf34f60c8aa4f4bd8c12b694522877a7..f88ffa7c82ab2980a55328e9fd56837b0e7f1883 100644 (file)
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -7,7 +7,7 @@
    
    Instances of this class can be thought of as factories or meta-classes
    for a variety of more specialized classes. Together this class and 
    
    Instances of this class can be thought of as factories or meta-classes
    for a variety of more specialized classes. Together this class and 

-   it's speciallized offspring completely define the environment and how
+   it's specialized offspring completely define the environment and how

    to access resources for a specific system. There are several sub
    areas that are all orthogonal - each system has a unique combination of
    these sub areas:
    to access resources for a specific system. There are several sub
    areas that are all orthogonal - each system has a unique combination of
    these sub areas:


@@ -23,7 +23,7 @@
        - Selection of local 'status' indexes that make up the pkgCache.
       
    It is important to note that the handling of index files is not a 
        - Selection of local 'status' indexes that make up the pkgCache.
       
    It is important to note that the handling of index files is not a 

-   function of the system. Index files are handled through a seperate 
+   function of the system. Index files are handled through a separate

    abstraction - the only requirement is that the index files have the
    same idea of versioning as the target system.
    
    abstraction - the only requirement is that the index files have the
    same idea of versioning as the target system.
    


@@ -37,10 +37,16 @@
 #ifndef PKGLIB_PKGSYSTEM_H
 #define PKGLIB_PKGSYSTEM_H
 
 #ifndef PKGLIB_PKGSYSTEM_H
 #define PKGLIB_PKGSYSTEM_H
 

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

 
 

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

 #include <vector>
 #include <vector>

-    
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/depcache.h>
+#endif
+
+class pkgDepCache;

 class pkgPackageManager;
 class pkgVersioningSystem;
 class Configuration;
 class pkgPackageManager;
 class pkgVersioningSystem;
 class Configuration;


@@ -79,10 +85,12 @@ class pkgSystem
    virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) = 0;   
    virtual bool FindIndex(pkgCache::PkgFileIterator File,
                          pkgIndexFile *&Found) const = 0;
    virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) = 0;   
    virtual bool FindIndex(pkgCache::PkgFileIterator File,
                          pkgIndexFile *&Found) const = 0;

-   
+

    /* Evauluate how 'right' we are for this system based on the filesystem
       etc.. */
    /* Evauluate how 'right' we are for this system based on the filesystem
       etc.. */

-   virtual signed Score(Configuration const &/*Cnf*/) {return 0;};
+   virtual signed Score(Configuration const &/*Cnf*/) {
+      return 0;
+   };

    
    pkgSystem();
    virtual ~pkgSystem() {};
    
    pkgSystem();
    virtual ~pkgSystem() {};