Merge branch 'debian/sid' of ssh://git.debian.org/git/apt/apt into debian/sid

[apt.git] / apt-inst / filelist.h

diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index 86766254f69003bb75c59dcbb4c55d81342915cd..0405d61dfca7e875a4071f3856cacfa0f69debe9 100644 (file)
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -28,10 +28,11 @@
 #ifndef PKGLIB_FILELIST_H
 #define PKGLIB_FILELIST_H
 
 #ifndef PKGLIB_FILELIST_H
 #define PKGLIB_FILELIST_H
 

-
-

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

+#include <cstring>
+#include <string>
+

 class pkgFLCache
 {
    public:
 class pkgFLCache
 {
    public:


@@ -48,7 +49,7 @@ class pkgFLCache
    class DiverIterator;
    
    protected:
    class DiverIterator;
    
    protected:

-   string CacheFile;
+   std::string CacheFile;

    DynamicMMap &Map;
    map_ptrloc LastTreeLookup;
    unsigned long LastLookupSize;
    DynamicMMap &Map;
    map_ptrloc LastTreeLookup;
    unsigned long LastLookupSize;