From 4f6d379124bc51a09608fa3f45d66713f927b959 Mon Sep 17 00:00:00 2001 From: наб Date: Tue, 12 Nov 2024 18:22:44 +0100 Subject: Drop APT::StringView --- apt-pkg/deb/deblistparser.cc | 19 ------------------- apt-pkg/deb/deblistparser.h | 9 --------- 2 files changed, 28 deletions(-) (limited to 'apt-pkg/deb') diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 375b5dbd6..e3041f848 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -563,25 +563,6 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, return res; } -#if APT_PKG_ABI <= 600 -const char *debListParser::ParseDepends(const char *Start,const char *Stop, - APT::StringView &Package,APT::StringView &Ver, - unsigned int &Op, bool ParseArchFlags, - bool const StripMultiArch, - bool const ParseRestrictionsList, - string Arch) -{ - string_view PackageView; - string_view VerView; - - auto res = ParseDepends(Start, Stop, PackageView, VerView, Op, (bool)ParseArchFlags, - (bool) StripMultiArch, (bool) ParseRestrictionsList, Arch); - Package = PackageView; - Ver = VerView; - - return res; -} -#endif const char *debListParser::ParseDepends(const char *Start, const char *Stop, string_view &Package, string_view &Ver, diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index aec09ed2e..27e900790 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -81,15 +81,6 @@ class APT_HIDDEN debListParser : public pkgCacheListParser bool const &ParseRestrictionsList = false, std::string const &Arch = ""); -#if APT_PKG_ABI <= 600 - [[deprecated("Use std::string_view variant instead")]] - APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop, - APT::StringView &Package, - APT::StringView &Ver, unsigned int &Op, - bool ParseArchFlags = false, bool StripMultiArch = true, - bool ParseRestrictionsList = false, - std::string Arch = ""); -#endif APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop, std::string_view &Package, std::string_view &Ver, unsigned int &Op, -- cgit v1.2.3-70-g09d2