reenable gcc warnings for deprecated functions

[apt.git] / apt-pkg / edsp / edspindexfile.h

diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 0053388eb8d790a227d0cc80108fdf992dd6f2ea..4548bff3c76a72b96e4cc0a7f3f529bc5a35c6c8 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -8,21 +8,35 @@
 #ifndef PKGLIB_EDSPINDEXFILE_H
 #define PKGLIB_EDSPINDEXFILE_H
 
 #ifndef PKGLIB_EDSPINDEXFILE_H
 #define PKGLIB_EDSPINDEXFILE_H
 

-#include <apt-pkg/indexfile.h>

 #include <apt-pkg/debindexfile.h>
 #include <apt-pkg/debindexfile.h>

+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/indexfile.h>
+#endif
+
+class OpProgress;
+class pkgCacheGenerator;

 
 

-class edspIndex : public debStatusIndex
+class APT_HIDDEN edspIndex : public pkgDebianIndexRealFile

 {
    /** \brief dpointer placeholder (for later in case we need it) */
 {
    /** \brief dpointer placeholder (for later in case we need it) */

-   void *d;
-
-   public:
+   void * const d;

 
 

-   virtual const Type *GetType() const;
+protected:
+   APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
+   virtual bool OpenListFile(FileFd &Pkg, std::string const &File) APT_OVERRIDE;
+   virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
+   virtual std::string GetComponent() const APT_OVERRIDE;
+   virtual std::string GetArchitecture() const APT_OVERRIDE;
+public:

 
 

-   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
+   virtual const Type *GetType() const APT_OVERRIDE APT_CONST;
+   virtual bool Exists() const APT_OVERRIDE;
+   virtual bool HasPackages() const APT_OVERRIDE;

 
 

-   edspIndex(string File);
+   edspIndex(std::string const &File);
+   virtual ~edspIndex();

 };
 
 #endif
 };
 
 #endif