merged r1811 from lp:~donkult/apt/experimenal

[apt.git] / ftparchive / override.h

diff --git a/ftparchive/override.h b/ftparchive/override.h
index 63f123c420c51641d0b2cb057591520d3f627f14..f270556ebe16dfc477bc8bfb7cd2eaa7f927a911 100644 (file)
--- a/ftparchive/override.h
+++ b/ftparchive/override.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: override.h,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: override.h,v 1.4 2001/06/26 02:50:27 jgg Exp $
 /* ######################################################################
 
    Override
@@ -12,12 +12,13 @@
 #ifndef OVERRIDE_H
 #define OVERRIDE_H
 
-#ifdef __GNUG__
-#pragma interface "override.h"
-#endif
+
 
 #include <map>
 #include <string>
+
+using std::string;
+using std::map;
     
 class Override
 {
@@ -26,25 +27,25 @@ class Override
    struct Item
    {
       string Priority;
-      string Section;
       string OldMaint;
       string NewMaint;
-      
+
+      map<string,string> FieldOverride;
       string SwapMaint(string Orig,bool &Failed);
+      ~Item() {};
    };
    
    map<string,Item> Mapping;
    
    inline Item *GetItem(string Package) 
    {
-      map<string,Item>::iterator I = Mapping.find(Package);
-      if (I == Mapping.end())
-        return 0;
-      return &I->second;
-   };
+      return GetItem(Package, "");
+   }
+   Item *GetItem(string Package, string Architecture);
    
    bool ReadOverride(string File,bool Source = false);
+   bool ReadExtraOverride(string File,bool Source = false);
 };
-    
+
 #endif