diff options
| author | Julian Andres Klode <jak@debian.org> | 2017-07-12 15:25:00 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2017-07-12 15:25:00 +0200 |
| commit | 11f92b12dbd029fa93618bc5f23cba18e794a132 (patch) | |
| tree | 9167ac5ce93c1cd98be1f0dd59a3f6db3fc0f86b /apt-pkg/edsp | |
| parent | 46e1aa6afd4239e263ce52525c09eb004b67405f (diff) | |
| parent | 51da6127d0073c9fc81f4b220f2360bd612ded5c (diff) | |
Merge branch 'misc/include-cleanup'
This should make it easier to read includes.
Diffstat (limited to 'apt-pkg/edsp')
| -rw-r--r-- | apt-pkg/edsp/edspindexfile.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/edsp/edsplistparser.cc | 7 | ||||
| -rw-r--r-- | apt-pkg/edsp/edsplistparser.h | 4 | ||||
| -rw-r--r-- | apt-pkg/edsp/edspsystem.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/edsp/edspsystem.h | 3 |
5 files changed, 9 insertions, 12 deletions
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc index 2d030daaf..1a8af89f0 100644 --- a/apt-pkg/edsp/edspindexfile.cc +++ b/apt-pkg/edsp/edspindexfile.cc @@ -16,10 +16,10 @@ #include <apt-pkg/pkgcache.h> #include <apt-pkg/pkgrecords.h> -#include <stddef.h> -#include <unistd.h> #include <memory> #include <string> +#include <stddef.h> +#include <unistd.h> /*}}}*/ // EDSP-like Index /*{{{*/ diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc index 4119639a6..b118e127d 100644 --- a/apt-pkg/edsp/edsplistparser.cc +++ b/apt-pkg/edsp/edsplistparser.cc @@ -12,15 +12,14 @@ #include <config.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/deblistparser.h> #include <apt-pkg/edsplistparser.h> +#include <apt-pkg/fileutl.h> #include <apt-pkg/md5.h> -#include <apt-pkg/deblistparser.h> #include <apt-pkg/pkgcache.h> -#include <apt-pkg/cacheiterators.h> -#include <apt-pkg/tagfile.h> -#include <apt-pkg/fileutl.h> #include <apt-pkg/pkgsystem.h> #include <apt-pkg/string_view.h> +#include <apt-pkg/tagfile.h> #include <array> diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h index 4904b6567..0fcc3f5fd 100644 --- a/apt-pkg/edsp/edsplistparser.h +++ b/apt-pkg/edsp/edsplistparser.h @@ -12,15 +12,15 @@ #define PKGLIB_EDSPLISTPARSER_H #include <apt-pkg/deblistparser.h> +#include <apt-pkg/fileutl.h> #include <apt-pkg/md5.h> #include <apt-pkg/pkgcache.h> -#include <apt-pkg/fileutl.h> #include <string> #ifndef APT_8_CLEANER_HEADERS -#include <apt-pkg/pkgcachegen.h> #include <apt-pkg/indexfile.h> +#include <apt-pkg/pkgcachegen.h> #include <apt-pkg/tagfile.h> #endif diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc index 1ceb21a17..47f5e06d5 100644 --- a/apt-pkg/edsp/edspsystem.cc +++ b/apt-pkg/edsp/edspsystem.cc @@ -15,9 +15,8 @@ #include <apt-pkg/debversion.h> #include <apt-pkg/edspindexfile.h> #include <apt-pkg/edspsystem.h> -#include <apt-pkg/pkgcache.h> -#include <apt-pkg/cacheiterators.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/pkgcache.h> #include <stddef.h> #include <stdlib.h> diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h index c0c9526b5..af8bcf128 100644 --- a/apt-pkg/edsp/edspsystem.h +++ b/apt-pkg/edsp/edspsystem.h @@ -10,9 +10,8 @@ #ifndef PKGLIB_EDSPSYSTEM_H #define PKGLIB_EDSPSYSTEM_H -#include <apt-pkg/pkgsystem.h> -#include <apt-pkg/cacheiterators.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/pkgsystem.h> #include <memory> #include <vector> |