From: Jay Freeman (saurik) Date: Wed, 30 Nov 2016 05:59:03 +0000 (-0800) Subject: std::map from std::initializer_list is "explicit". X-Git-Tag: cydia_1.1.28%b1~12 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/fd70eebe454d74e6133caf1254d80a4efda2490a std::map from std::initializer_list is "explicit". --- diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index f903617f7..879760934 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -34,8 +34,8 @@ class APT_HIDDEN debReleaseIndex : public metaIndex APT_HIDDEN std::string MetaIndexFile(const char *Types) const; APT_HIDDEN std::string MetaIndexURI(const char *Type) const; - debReleaseIndex(std::string const &URI, std::string const &Dist, std::map const &Options); - debReleaseIndex(std::string const &URI, std::string const &Dist, bool const Trusted, std::map const &Options); + debReleaseIndex(std::string const &URI, std::string const &Dist, std::map const &Options = std::map()); + debReleaseIndex(std::string const &URI, std::string const &Dist, bool const Trusted, std::map const &Options = std::map()); virtual ~debReleaseIndex(); virtual std::string ArchiveURI(std::string const &File) const APT_OVERRIDE {return URI + File;}; diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index ca5c42cb7..cf3bb058d 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -550,7 +550,7 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, if(Debug) cout << "Signature verify for: " << *I << endl; - metaIndex *MetaIndex = new debReleaseIndex("","", {}); + metaIndex *MetaIndex = new debReleaseIndex("",""); string prefix = *I; string const releasegpg = *I+"Release.gpg";