Merge branch 'debian/sid' into debian/experimental

[apt.git] / ftparchive / override.h

diff --git a/ftparchive/override.h b/ftparchive/override.h
index e646417760a9714f1749e4000d2c9c8297a3f41d..c5cacc2b45b71c6cbdf41b4784e001b20c402b57 100644 (file)
--- a/ftparchive/override.h
+++ b/ftparchive/override.h
@@ -12,9 +12,7 @@
 #ifndef OVERRIDE_H
 #define OVERRIDE_H
 
 #ifndef OVERRIDE_H
 #define OVERRIDE_H
 

-#ifdef __GNUG__
-#pragma interface "override.h"
-#endif
+

 
 #include <map>
 #include <string>
 
 #include <map>
 #include <string>


@@ -33,20 +31,20 @@ class Override
       string NewMaint;
 
       map<string,string> FieldOverride;
       string NewMaint;
 
       map<string,string> FieldOverride;

-      string SwapMaint(string Orig,bool &Failed);
+      string SwapMaint(string const &Orig,bool &Failed);

       ~Item() {};
    };
    
    map<string,Item> Mapping;
    
       ~Item() {};
    };
    
    map<string,Item> Mapping;
    

-   inline Item *GetItem(string Package) 
+   inline Item *GetItem(string const &Package) 

    {
       return GetItem(Package, "");
    }
    {
       return GetItem(Package, "");
    }

-   Item *GetItem(string Package, string Architecture);
+   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
 };
 
 #endif