X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/64177f1732fad72e76e8d2e8c576c635af2bbc4f..e7bd4a8a34532afa382a995b9fbaa9333f42e86d:/ftparchive/override.h diff --git a/ftparchive/override.h b/ftparchive/override.h index 2d6a4e27c..c5cacc2b4 100644 --- a/ftparchive/override.h +++ b/ftparchive/override.h @@ -12,9 +12,7 @@ #ifndef OVERRIDE_H #define OVERRIDE_H -#ifdef __GNUG__ -#pragma interface "override.h" -#endif + #include #include @@ -33,21 +31,20 @@ class Override string NewMaint; map FieldOverride; - string SwapMaint(string Orig,bool &Failed); + 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 ReadExtraOverride(string File,bool Source = false); + bool ReadOverride(string const &File,bool const &Source = false); + bool ReadExtraOverride(string const &File,bool const &Source = false); }; #endif