Fix the test suite harder

[apt.git] / apt-pkg / tagfile.h

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 81fff89f06782557cc054304d5f6b0f09b7637c6..19c07595e13066307cc24a41fa08d8d9ca945fe9 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -37,14 +37,7 @@ class pkgTagSectionPrivate;
 class pkgTagSection
 {
    const char *Section;
 class pkgTagSection
 {
    const char *Section;

-   // We have a limit of 256 tags per section with the old abi
-#if APT_PKG_ABI < 413
-   APT_DEPRECATED unsigned int Indexes[256];
-#endif

    unsigned int AlphaIndexes[0x100];
    unsigned int AlphaIndexes[0x100];

-#if APT_PKG_ABI < 413
-   APT_DEPRECATED unsigned int TagCount;
-#endif

 
    pkgTagSectionPrivate * const d;
 
 
    pkgTagSectionPrivate * const d;
 


@@ -63,6 +56,10 @@ class pkgTagSection
    signed int FindI(const char *Tag,signed long Default = 0) const;
    bool FindB(const char *Tag, bool const &Default = false) const;
    unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;
    signed int FindI(const char *Tag,signed long Default = 0) const;
    bool FindB(const char *Tag, bool const &Default = false) const;
    unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;

+   bool FindFlag(const char * const Tag,uint8_t &Flags,
+                uint8_t const Flag) const;
+   bool static FindFlag(uint8_t &Flags, uint8_t const Flag,
+                               const char* const Start, const char* const Stop);

    bool FindFlag(const char *Tag,unsigned long &Flags,
                 unsigned long Flag) const;
    bool static FindFlag(unsigned long &Flags, unsigned long Flag,
    bool FindFlag(const char *Tag,unsigned long &Flags,
                 unsigned long Flag) const;
    bool static FindFlag(unsigned long &Flags, unsigned long Flag,


@@ -84,12 +81,7 @@ class pkgTagSection
     * @return \b true if section end was found, \b false otherwise.
     *  Beware that internal state will be inconsistent if \b false is returned!
     */
     * @return \b true if section end was found, \b false otherwise.
     *  Beware that internal state will be inconsistent if \b false is returned!
     */

-#if APT_PKG_ABI >= 413

    APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength, bool const Restart = true);
    APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength, bool const Restart = true);

-#else
-   APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength, bool const Restart);
-   APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength);
-#endif

 
    inline unsigned long size() const {return Stop - Section;};
    void Trim();
 
    inline unsigned long size() const {return Stop - Section;};
    void Trim();


@@ -101,11 +93,7 @@ class pkgTagSection
     * times, but only the last occurrence is available via Find methods.
     */
    unsigned int Count() const;
     * times, but only the last occurrence is available via Find methods.
     */
    unsigned int Count() const;

-#if APT_PKG_ABI >= 413

    bool Exists(const char* const Tag) const;
    bool Exists(const char* const Tag) const;

-#else
-   bool Exists(const char* const Tag);
-#endif

 
    void Get(const char *&Start,const char *&Stop,unsigned int I) const;
 
 
    void Get(const char *&Start,const char *&Stop,unsigned int I) const;
 


@@ -147,7 +135,7 @@ class pkgTagSection
    for being a bit slower to allow comments and new lines all over the place */
 class pkgUserTagSection : public pkgTagSection
 {
    for being a bit slower to allow comments and new lines all over the place */
 class pkgUserTagSection : public pkgTagSection
 {

-   virtual void TrimRecord(bool BeforeRecord, const char* &End);
+   virtual void TrimRecord(bool BeforeRecord, const char* &End) APT_OVERRIDE;

 };
 
 class pkgTagFilePrivate;
 };
 
 class pkgTagFilePrivate;