From 453b82a388013e522b3a1b9fcd6ed0810dab1f4f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 5 Mar 2014 22:11:25 +0100
Subject: cleanup headers and especially #includes everywhere

Beside being a bit cleaner it hopefully also resolves oddball problems
I have with high levels of parallel jobs.

Git-Dch: Ignore
Reported-By: iwyu (include-what-you-use)
---
 apt-pkg/sourcelist.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'apt-pkg/sourcelist.h')

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 0ccb4aa00..af7569375 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -27,18 +27,26 @@
 #ifndef PKGLIB_SOURCELIST_H
 #define PKGLIB_SOURCELIST_H
 
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <time.h>
+
 #include <string>
 #include <vector>
 #include <map>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/tagfile.h>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/tagfile.h>
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/metaindex.h>
 using std::string;
 using std::vector;
 #endif
 
+class FileFd;
+class pkgTagSection;
 class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;
-- 
cgit v1.2.3


From a02db58fd50ef7fc2f0284852c6b3f98e458a232 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 6 Mar 2014 00:33:10 +0100
Subject: follow method attribute suggestions by gcc

Git-Dch: Ignore
Reported-By: gcc -Wsuggest-attribute={pure,const,noreturn}
---
 apt-pkg/sourcelist.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'apt-pkg/sourcelist.h')

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index af7569375..9df0c1d74 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -29,6 +29,7 @@
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
 
 #include <time.h>
 
@@ -63,7 +64,7 @@ class pkgSourceList
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
-      static Type *GetType(const char *Type);
+      static Type *GetType(const char *Type) APT_PURE;
 
       const char *Name;
       const char *Label;
-- 
cgit v1.2.3