Merge branch 'noref' into 'main'

std::string_view const & -> std::string_view

See merge request apt-team/apt!397

4 files changed, 7 insertions, 7 deletions

diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index ad5578966..02d1566c8 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -208,7 +208,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/)
 /* Returns a override item for the given package and the given architecture.
  * Treats "all" special
  */
-Override::Item* Override::GetItem(std::string_view const &Package, std::string_view const &Architecture)
+Override::Item* Override::GetItem(std::string_view Package, std::string_view Architecture)
 {
    map<string,Item>::const_iterator I = Mapping.find(Package);
    map<string,Item>::iterator J = Mapping.find(std::string{Package}.append("/").append(Architecture));
@@ -246,7 +246,7 @@ Override::Item* Override::GetItem(std::string_view const &Package, std::string_v
    there is a rule but it does not match then the empty string is returned,
    also if there was no rewrite rule the empty string is returned. Failed
    indicates if there was some kind of problem while rewriting. */
-string Override::Item::SwapMaint(std::string_view const &Orig,bool &Failed)
+string Override::Item::SwapMaint(std::string_view Orig,bool &Failed)
 {
    Failed = false;
 
diff --git a/ftparchive/override.h b/ftparchive/override.h
index f57c71df9..ea3b5b9c6 100644
--- a/ftparchive/override.h
+++ b/ftparchive/override.h
@@ -28,17 +28,17 @@ class Override
       string NewMaint;
 
       map<string,string> FieldOverride;
-      string SwapMaint(std::string_view const &Orig,bool &Failed);
+      string SwapMaint(std::string_view Orig,bool &Failed);
       ~Item() {};
    };
 
    map<string,Item,std::less<>> Mapping;
 
-   inline Item *GetItem(std::string_view const &Package)
+   inline Item *GetItem(std::string_view Package)
    {
       return GetItem(Package, "");
    }
-   Item *GetItem(std::string_view const &Package, std::string_view const &Architecture);
+   Item *GetItem(std::string_view Package, std::string_view Architecture);
 
    bool ReadOverride(string const &File,bool const &Source = false);
    bool ReadExtraOverride(string const &File,bool const &Source = false);
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index dcae84b86..a5b889c15 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -549,7 +549,7 @@ TranslationWriter::TranslationWriter(string const &File, string const &TransComp
 // TranslationWriter::DoPackage - Process a single package		/*{{{*/
 // ---------------------------------------------------------------------
 /* Create a Translation-Master file for this Packages file */
-bool TranslationWriter::DoPackage(string_view const &Pkg, string const &Desc,
+bool TranslationWriter::DoPackage(string_view Pkg, string const &Desc,
 				  string const &MD5)
 {
    if (Output == NULL)
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index a366233ab..cadddc2b9 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -95,7 +95,7 @@ class TranslationWriter
    FileFd *Output;
 
    public:
-   bool DoPackage(std::string_view const &Pkg, string const &Desc, string const &MD5);
+   bool DoPackage(std::string_view Pkg, string const &Desc, string const &MD5);
 
    TranslationWriter(string const &File, string const &TransCompress, mode_t const &Permissions);
    ~TranslationWriter();