add support for Build-Depends/Conflicts-Arch

[apt.git] / apt-pkg / deb / deblistparser.h

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 1c5275e0a8b082abe846b83de586a2eef2bff0e5..a78312f9d6e07283223aa7962b9330963800b110 100644 (file)
--- 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;
       
    // 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 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<std::string> AvailableDescriptionLanguages() APT_OVERRIDE;
    virtual MD5SumValue Description_md5() APT_OVERRIDE;
    virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE;
    virtual std::vector<std::string> 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:
 class APT_HIDDEN debTranslationsParser : public debListParser
 {
  public:

+#ifdef APT_PKG_EXPOSE_STRING_VIEW

    // a translation can never be a real package
    // 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) {};
 
    debTranslationsParser(FileFd *File)
       : debListParser(File) {};