diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-06-12 15:03:19 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-06-12 15:03:19 +0200 |
| commit | c11ab3e93624e7ac8050a287aba5b115aff0fea6 (patch) | |
| tree | f87173bc7986992043a8e07ae05cae9bed8083fd /apt-pkg/deb | |
| parent | f9709234fc133bda96418d7f363e63d6f5fb1b09 (diff) | |
| parent | 82b881caafa0c82b20db3900f8b76cebd8a393a4 (diff) | |
Merge branch 'pu/cleaner-headers'
Diffstat (limited to 'apt-pkg/deb')
| -rw-r--r-- | apt-pkg/deb/debfile.h | 6 | ||||
| -rw-r--r-- | apt-pkg/deb/deblistparser.h | 3 | ||||
| -rw-r--r-- | apt-pkg/deb/debmetaindex.h | 6 | ||||
| -rw-r--r-- | apt-pkg/deb/debrecords.h | 3 | ||||
| -rw-r--r-- | apt-pkg/deb/debsystem.h | 3 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.h | 7 |
6 files changed, 0 insertions, 28 deletions
diff --git a/apt-pkg/deb/debfile.h b/apt-pkg/deb/debfile.h index 21c59a567..06b54a43f 100644 --- a/apt-pkg/deb/debfile.h +++ b/apt-pkg/deb/debfile.h @@ -29,12 +29,6 @@ #include <string> -#ifndef APT_8_CLEANER_HEADERS -#include <apt-pkg/md5.h> -#endif -#ifndef APT_10_CLEANER_HEADERS -#include <apt-pkg/pkgcache.h> -#endif class FileFd; diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 807968452..c041585e6 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -20,9 +20,6 @@ #include <vector> #include <apt-pkg/string_view.h> -#ifndef APT_8_CLEANER_HEADERS -#include <apt-pkg/indexfile.h> -#endif class FileFd; diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index 864ac3eba..0038f52f9 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -8,12 +8,6 @@ #include <string> #include <vector> -#ifndef APT_8_CLEANER_HEADERS -#include <apt-pkg/sourcelist.h> -#endif -#ifndef APT_10_CLEANER_HEADERS -#include <apt-pkg/init.h> -#endif class pkgAcquire; class pkgIndexFile; diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index ea3fc320a..10ef91768 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -20,9 +20,6 @@ #include <string> -#ifndef APT_8_CLEANER_HEADERS -#include <apt-pkg/indexfile.h> -#endif class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser { diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h index 4503676fa..3a308fb1c 100644 --- a/apt-pkg/deb/debsystem.h +++ b/apt-pkg/deb/debsystem.h @@ -19,9 +19,6 @@ class pkgPackageManager; class debSystemPrivate; class pkgDepCache; -#ifndef APT_10_CLEANER_HEADERS -class debStatusIndex; -#endif class debSystem : public pkgSystem { diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 3ba4770e8..a656bf19c 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -18,17 +18,10 @@ #include <vector> #include <stdio.h> -#ifndef APT_10_CLEANER_HEADERS -#include <apt-pkg/init.h> -#endif class pkgDepCache; namespace APT { namespace Progress { class PackageManager; } } -#ifndef APT_8_CLEANER_HEADERS -using std::vector; -using std::map; -#endif class pkgDPkgPMPrivate; |