* "normal" merge, resolved lots of conflicts

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

diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index 7d0e42d..a7d5551 100644 (file)
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: pkgsystem.h,v 1.2 2001/02/20 07:03:17 jgg Exp $
+// $Id: pkgsystem.h,v 1.6 2002/11/11 06:55:50 doogie Exp $
 /* ######################################################################
 
    System - Abstraction for running on different systems.
@@ -42,7 +42,7 @@
 #endif
 
 #include <apt-pkg/depcache.h>
-#include <vector.h>
+#include <vector>
     
 class pkgPackageManager;
 class pkgVersioningSystem;
@@ -72,18 +72,20 @@ class pkgSystem
 
    /* Load environment specific configuration and perform any other setup
       necessary */
-   virtual bool Initialize(Configuration &Cnf) {return true;};
+   virtual bool Initialize(Configuration &/*Cnf*/) {return true;};
    
    /* Type is some kind of Globally Unique way of differentiating
       archive file types.. */
    virtual bool ArchiveSupported(const char *Type) = 0;
 
    // Return a list of system index files..
-   virtual bool AddStatusFiles(vector<pkgIndexFile *> &List) = 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.. */
-   virtual signed Score(Configuration const &Cnf) {return 0;};
+   virtual signed Score(Configuration const &/*Cnf*/) {return 0;};
    
    pkgSystem();
    virtual ~pkgSystem() {};