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/cacheiterators.h | |
| parent | 46e1aa6afd4239e263ce52525c09eb004b67405f (diff) | |
| parent | 51da6127d0073c9fc81f4b220f2360bd612ded5c (diff) | |
Merge branch 'misc/include-cleanup'
This should make it easier to read includes.
Diffstat (limited to 'apt-pkg/cacheiterators.h')
| -rw-r--r-- | apt-pkg/cacheiterators.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 62d0ab59c..0cb684382 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -29,17 +29,19 @@ /*}}}*/ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H -#include<apt-pkg/pkgcache.h> -#include<apt-pkg/macros.h> +#ifndef __PKGLIB_IN_PKGCACHE_H +#warning apt-pkg/cacheiterators.h should not be included directly, include apt-pkg/pkgcache.h instead +#endif +#include <apt-pkg/macros.h> -#include<iterator> #include <iosfwd> +#include <iterator> #include <string> #ifdef APT_PKG_EXPOSE_STRING_VIEW #include <apt-pkg/string_view.h> #endif -#include<string.h> +#include <string.h> // abstract Iterator template /*{{{*/ /* This template provides the very basic iterator methods we |