From 8efd5947bf7de0fc3db51b4871bcf3522018761d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 26 Jan 2016 23:18:05 +0100 Subject: convert Version() and Architecture() to APT::StringView Part of hidden classes, so conversion is abi-free. Git-Dch: Ignore --- apt-pkg/deb/deblistparser.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'apt-pkg/deb/deblistparser.h') diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 1c5275e0a..a78312f9d 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -69,9 +69,11 @@ class APT_HIDDEN debListParser : public pkgCacheListParser // These all operate against the current section virtual std::string Package() APT_OVERRIDE; - virtual std::string Architecture() APT_OVERRIDE; virtual bool ArchitectureAll() APT_OVERRIDE; - virtual std::string Version() APT_OVERRIDE; +#ifdef APT_PKG_EXPOSE_STRING_VIEW + virtual APT::StringView Architecture() APT_OVERRIDE; + virtual APT::StringView Version() APT_OVERRIDE; +#endif virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE; virtual std::vector AvailableDescriptionLanguages() APT_OVERRIDE; virtual MD5SumValue Description_md5() APT_OVERRIDE; @@ -128,9 +130,11 @@ class APT_HIDDEN debDebFileParser : public debListParser class APT_HIDDEN debTranslationsParser : public debListParser { public: +#ifdef APT_PKG_EXPOSE_STRING_VIEW // a translation can never be a real package - virtual std::string Architecture() APT_OVERRIDE { return ""; } - virtual std::string Version() APT_OVERRIDE { return ""; } + virtual APT::StringView Architecture() APT_OVERRIDE { return ""; } + virtual APT::StringView Version() APT_OVERRIDE { return ""; } +#endif debTranslationsParser(FileFd *File) : debListParser(File) {}; -- cgit v1.2.3