testcases runable as root

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

diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index aa221158ec0569150d3bb6198a9e40a67046ffd3..701beb0758a565455500f845e347626618d56b0f 100644 (file)
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -14,16 +14,18 @@
 #include <string>
 #include <stdio.h>
 
 #include <string>
 #include <stdio.h>
 

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

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

+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/gpgv.h>
+class FileFd;
+#endif

 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::vector;
 #endif
 
 class pkgTagSection;
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::vector;
 #endif
 
 class pkgTagSection;

-class FileFd;

 class indexRecords;
 class pkgCdromStatus;
 
 class indexRecords;
 class pkgCdromStatus;
 


@@ -51,7 +53,7 @@ class IndexCopy                                                               /*{{{*/
 
    bool CopyPackages(std::string CDROM,std::string Name,std::vector<std::string> &List,
                     pkgCdromStatus *log);
 
    bool CopyPackages(std::string CDROM,std::string Name,std::vector<std::string> &List,
                     pkgCdromStatus *log);

-   virtual ~IndexCopy() {};
+   virtual ~IndexCopy();

 };
                                                                        /*}}}*/
 class PackageCopy : public IndexCopy                                   /*{{{*/
 };
                                                                        /*}}}*/
 class PackageCopy : public IndexCopy                                   /*{{{*/


@@ -91,24 +93,18 @@ class SigVerify                                                             /*{{{*/
    /** \brief dpointer placeholder (for later in case we need it) */
    void *d;
 
    /** \brief dpointer placeholder (for later in case we need it) */
    void *d;
 

-   bool Verify(std::string prefix,std::string file, indexRecords *records);
-   bool CopyMetaIndex(std::string CDROM, std::string CDName, 
+   APT_HIDDEN bool Verify(std::string prefix,std::string file, indexRecords *records);
+   APT_HIDDEN bool CopyMetaIndex(std::string CDROM, std::string CDName,

                      std::string prefix, std::string file);
 
  public:
    bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
                      std::vector<std::string> PkgList,std::vector<std::string> SrcList);
 
                      std::string prefix, std::string file);
 
  public:
    bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
                      std::vector<std::string> PkgList,std::vector<std::string> SrcList);
 

-   __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
-                      int const &statusfd, int fd[2]) {
-      ExecGPGV(File, FileOut, statusfd, fd);
-      return false;
-   };
-   __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
-                             int const &statusfd = -1) {
-      ExecGPGV(File, FileOut, statusfd);
-      return false;
-   };
+   APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut,
+                      int const &statusfd, int fd[2]);
+   APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut,
+                             int const &statusfd = -1);

 };
                                                                        /*}}}*/
 
 };
                                                                        /*}}}*/