merge with my debian-sid branch

[apt.git] / apt-inst / database.cc

diff --git a/apt-inst/database.cc b/apt-inst/database.cc
index a5020f3d76c2c4025b6948141ae04c327c1b1141..da7613491105eb9b9e11904d4f9872c56bc3add5 100644 (file)
--- a/apt-inst/database.cc
+++ b/apt-inst/database.cc
@@ -8,14 +8,18 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

 #include <apt-pkg/database.h>
 #include <apt-pkg/database.h>

+#include <apt-pkg/filelist.h>
+#include <apt-pkg/pkgcachegen.h>

                                                                        /*}}}*/
 
 // DataBase::GetMetaTmp - Get the temp dir                             /*{{{*/
 // ---------------------------------------------------------------------
 /* This re-initializes the meta temporary directory if it hasn't yet 
    been inited for this cycle. The flag is the emptyness of MetaDir */
                                                                        /*}}}*/
 
 // DataBase::GetMetaTmp - Get the temp dir                             /*{{{*/
 // ---------------------------------------------------------------------
 /* This re-initializes the meta temporary directory if it hasn't yet 
    been inited for this cycle. The flag is the emptyness of MetaDir */

-bool pkgDataBase::GetMetaTmp(string &Dir)
+bool pkgDataBase::GetMetaTmp(std::string &Dir)

 {
    if (MetaDir.empty() == true)
       if (InitMetaTmp(MetaDir) == false)
 {
    if (MetaDir.empty() == true)
       if (InitMetaTmp(MetaDir) == false)


@@ -24,3 +28,8 @@ bool pkgDataBase::GetMetaTmp(string &Dir)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+pkgDataBase::~pkgDataBase()
+{
+   delete Cache;
+   delete FList;
+}