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)

---
 apt-pkg/version.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 49c53a93a..c9257d116 100644
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -24,8 +24,6 @@
 #include <apt-pkg/strutl.h>    
 #include <string>
 
-using std::string;
-
 class pkgVersioningSystem
 {
    public:
@@ -43,7 +41,7 @@ class pkgVersioningSystem
    virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) = 0;
    virtual int DoCmpReleaseVer(const char *A,const char *Aend,
 			       const char *B,const char *Bend) = 0;
-   virtual string UpstreamVersion(const char *A) = 0;
+   virtual std::string UpstreamVersion(const char *A) = 0;
    
    // See if the given VS is compatible with this one.. 
    virtual bool TestCompatibility(pkgVersioningSystem const &Against) 
-- 
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

---
 apt-pkg/version.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index c9257d116..47e1919bb 100644
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -20,8 +20,7 @@
 #ifndef PKGLIB_VERSION_H
 #define PKGLIB_VERSION_H
 
-
-#include <apt-pkg/strutl.h>    
+#include <apt-pkg/strutl.h>
 #include <string>
 
 class pkgVersioningSystem
-- 
cgit v1.2.3


From 1bc6873583b01469f4981d738f4d0d4132ccfdbf Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 19:27:07 +0200
Subject: remove old APT_COMPATIBILITY ifdef's

---
 apt-pkg/version.h | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 47e1919bb..92dbc2576 100644
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -54,8 +54,4 @@ class pkgVersioningSystem
    virtual ~pkgVersioningSystem() {};
 };
 
-#ifdef APT_COMPATIBILITY
-#include <apt-pkg/debversion.h>
-#endif
-
 #endif
-- 
cgit v1.2.3