replace ignore-deprecated #pragma dance with _Pragma

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

diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 18a90a29da868bd009e5e8da343a324c2477d4c7..7c4d0c1aa1a6e0f77f42a97e95ae8774a188c0e6 100644 (file)
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -1,12 +1,19 @@
 #ifndef PKGLIB_METAINDEX_H
 #define PKGLIB_METAINDEX_H
 
 #ifndef PKGLIB_METAINDEX_H
 #define PKGLIB_METAINDEX_H
 

-
-#include <string>
-#include <apt-pkg/pkgcache.h>

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

+#include <stddef.h>
+
+#include <string>
+#include <vector>
+
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/pkgcache.h>
+class pkgCacheGenerator;
+class OpProgress;
+#endif

 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>


@@ -15,8 +22,6 @@ using std::string;
 #endif
 
 class pkgAcquire;
 #endif
 
 class pkgAcquire;

-class pkgCacheGenerator;
-class OpProgress;

 
 class metaIndex
 {
 
 class metaIndex
 {


@@ -48,7 +53,7 @@ class metaIndex
 
    metaIndex(std::string const &URI, std::string const &Dist, 
              char const * const Type) 
 
    metaIndex(std::string const &URI, std::string const &Dist, 
              char const * const Type) 

-      : Indexes(NULL), Type(Type), URI(URI), Dist(Dist)
+      : Indexes(NULL), Type(Type), URI(URI), Dist(Dist), Trusted(false)

    {
       /* nothing */
    }
    {
       /* nothing */
    }