X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b2e465d6d32d2dc884f58b94acb7e35f671a87fe..51da0c3587c9d36a3c04b3e28b99d8331a29b230:/ftparchive/override.h?ds=sidebyside diff --git a/ftparchive/override.h b/ftparchive/override.h index 63f123c42..c5cacc2b4 100644 --- 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 #include + +using std::string; +using std::map; class Override { @@ -26,25 +27,25 @@ class Override struct Item { string Priority; - string Section; string OldMaint; string NewMaint; - - string SwapMaint(string Orig,bool &Failed); + + map FieldOverride; + string SwapMaint(string const &Orig,bool &Failed); + ~Item() {}; }; map Mapping; - inline Item *GetItem(string Package) + inline Item *GetItem(string const &Package) { - map::iterator I = Mapping.find(Package); - if (I == Mapping.end()) - return 0; - return &I->second; - }; + return GetItem(Package, ""); + } + Item *GetItem(string const &Package, string const &Architecture); - bool ReadOverride(string File,bool Source = false); + bool ReadOverride(string const &File,bool const &Source = false); + bool ReadExtraOverride(string const &File,bool const &Source = false); }; - + #endif