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/pkgcache.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/pkgcache.h')
| -rw-r--r-- | apt-pkg/pkgcache.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 91228f713..e1597c1b1 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -73,13 +73,13 @@ /*}}}*/ #ifndef PKGLIB_PKGCACHE_H #define PKGLIB_PKGCACHE_H - -#include <apt-pkg/mmap.h> +#define __PKGLIB_IN_PKGCACHE_H #include <apt-pkg/macros.h> +#include <apt-pkg/mmap.h> #include <string> -#include <time.h> #include <stdint.h> +#include <time.h> #ifdef APT_PKG_EXPOSE_STRING_VIEW #include <apt-pkg/string_view.h> @@ -783,10 +783,13 @@ inline char const * pkgCache::NativeArch() #include <apt-pkg/cacheiterators.h> -inline pkgCache::GrpIterator pkgCache::GrpBegin() - {return GrpIterator(*this);} -inline pkgCache::GrpIterator pkgCache::GrpEnd() - {return GrpIterator(*this,GrpP);} + inline pkgCache::GrpIterator pkgCache::GrpBegin() + { + return GrpIterator(*this); + } + inline pkgCache::GrpIterator pkgCache::GrpEnd() + { + return GrpIterator(*this, GrpP);} inline pkgCache::PkgIterator pkgCache::PkgBegin() {return PkgIterator(*this);} inline pkgCache::PkgIterator pkgCache::PkgEnd() @@ -822,4 +825,5 @@ class pkgCache::Namespace /*{{{*/ typedef pkgCache::Flag Flag; }; /*}}}*/ +#undef __PKGLIB_IN_PKGCACHE_H #endif |