From 8f3ba4e8708cb72be19dacc2af4f601ee5fea292 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 13:31:29 +0200
Subject: do not pollute namespace in the headers with using (Closes: #500198)

---
 ftparchive/multicompress.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ftparchive/multicompress.h')

diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index 4839af47d..19e5065fa 100644
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -29,7 +29,7 @@ class MultiCompress
    // An output file
    struct Files
    {
-      string Output;
+      std::string Output;
       APT::Configuration::Compressor CompressProg;
       Files *Next;
       FileFd TmpFile;
@@ -57,9 +57,9 @@ class MultiCompress
    bool Finalize(unsigned long long &OutSize);
    bool OpenOld(int &Fd,pid_t &Proc);
    bool CloseOld(int Fd,pid_t Proc);
-   static bool GetStat(string const &Output,string const &Compress,struct stat &St);
+   static bool GetStat(std::string const &Output,std::string const &Compress,struct stat &St);
    
-   MultiCompress(string const &Output,string const &Compress,
+   MultiCompress(std::string const &Output,std::string const &Compress,
 		 mode_t const &Permissions, bool const &Write = true);
    ~MultiCompress();
 };
-- 
cgit v1.2.3


From 472ff00ef2e48383805d281c6364ec27839e3f4d Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 19:14:19 +0200
Subject: use forward declaration in headers if possible instead of includes

---
 ftparchive/multicompress.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'ftparchive/multicompress.h')

diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index 19e5065fa..5496b06d0 100644
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -16,11 +16,10 @@
 #ifndef MULTICOMPRESS_H
 #define MULTICOMPRESS_H
 
-
-
-#include <string>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/aptconfiguration.h>
+
+#include <string>
 #include <stdio.h>
 #include <sys/types.h>
     
-- 
cgit v1.2.3