From cf0257b4d2f559a914fcafa58e5819f624dc8599 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 5 Jan 2025 19:29:47 +0100 Subject: Ensure we can build with APT_PKG_ABI > 601 There were some references to APT::StringView that don't make much sense anymore. --- apt-pkg/deb/deblistparser.cc | 3 ++- apt-pkg/deb/deblistparser.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index f43060394..db3478f53 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -563,6 +563,7 @@ 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, @@ -580,7 +581,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, 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 aa39bada2..637063f94 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -81,13 +81,14 @@ class APT_HIDDEN debListParser : public pkgCacheListParser bool const &ParseRestrictionsList = false, std::string const &Arch = ""); +#if APT_PKG_ABI <= 600 APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop, APT::StringView &Package, APT::StringView &Ver, unsigned int &Op, bool const ParseArchFlags = false, bool StripMultiArch = true, bool const ParseRestrictionsList = false, std::string Arch = "") APT_DEPRECATED_MSG("Use std::string_view variant instead"); - +#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