From 43fb90dcd5d3f8887c1903073ad21a53847974ba Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 28 Jan 2011 20:55:45 +0100
Subject: apt-pkg/tagfile.h: add dpointer placeholder, make destructor virtual;
 apt-pkg/deb/debsystem.h: make destructor virtual

---
 apt-pkg/deb/debsystem.h |  2 +-
 apt-pkg/tagfile.h       | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index 7c53e1829..232155256 100644
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -34,7 +34,7 @@ class debSystem : public pkgSystem
 			  pkgIndexFile *&Found) const;
 
    debSystem();
-   ~debSystem();
+   virtual ~debSystem();
 };
 
 extern debSystem debSys;
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 68f1642d9..f361a787f 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -31,11 +31,8 @@ class pkgTagSection
    unsigned int Indexes[256];
    unsigned int AlphaIndexes[0x100];
    unsigned int TagCount;
-   // for later
-   int *reserved1;
-   int *reserved2;
-   int *reserved3;
-   int *reserved4;
+   // dpointer placeholder (for later in case we need it)
+   void *d;
 
    /* This very simple hash function for the last 8 letters gives
       very good performance on the debian package files */
@@ -80,6 +77,7 @@ class pkgTagSection
    };
    
    pkgTagSection() : Section(0), Stop(0) {};
+   virtual ~pkgTagSection() {};
 };
 
 class pkgTagFilePrivate;
@@ -97,7 +95,7 @@ class pkgTagFile
    bool Jump(pkgTagSection &Tag,unsigned long Offset);
 
    pkgTagFile(FileFd *F,unsigned long Size = 32*1024);
-   ~pkgTagFile();
+   virtual ~pkgTagFile();
 };
 
 /* This is the list of things to rewrite. The rewriter
-- 
cgit v1.2.3