calculate only expected hashes in methods

[apt.git] / apt-pkg / contrib / mmap.h

diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index e0ff8db95049f494299a5a835c1caba9cd9463cc..c1dfedf6da9b6b9d1244ec5c28414e95afc4cff1 100644 (file)
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -6,7 +6,7 @@
    MMap Class - Provides 'real' mmap or a faked mmap using read().
 
    The purpose of this code is to provide a generic way for clients to
    MMap Class - Provides 'real' mmap or a faked mmap using read().
 
    The purpose of this code is to provide a generic way for clients to

-   access the mmap function. In enviroments that do not support mmap
+   access the mmap function. In environments that do not support mmap

    from file fd's this function will use read and normal allocated 
    memory.
    
    from file fd's this function will use read and normal allocated 
    memory.
    


@@ -15,7 +15,7 @@
 
    The DynamicMMap class is used to help the on-disk data structure 
    generators. It provides a large allocated workspace and members
 
    The DynamicMMap class is used to help the on-disk data structure 
    generators. It provides a large allocated workspace and members

-   to allocate space from the workspace in an effecient fashion.
+   to allocate space from the workspace in an efficient fashion.

    
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Jason Gunthorpe.
    
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Jason Gunthorpe.


@@ -27,9 +27,13 @@
 
 
 #include <string>
 
 
 #include <string>

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

 
 

+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>

 using std::string;
 using std::string;

+#endif
+
+class FileFd;

 
 /* This should be a 32 bit type, larger tyes use too much ram and smaller
    types are too small. Where ever possible 'unsigned long' should be used
 
 /* This should be a 32 bit type, larger tyes use too much ram and smaller
    types are too small. Where ever possible 'unsigned long' should be used


@@ -102,7 +106,7 @@ class DynamicMMap : public MMap
    unsigned long RawAllocate(unsigned long long Size,unsigned long Aln = 0);
    unsigned long Allocate(unsigned long ItemSize);
    unsigned long WriteString(const char *String,unsigned long Len = (unsigned long)-1);
    unsigned long RawAllocate(unsigned long long Size,unsigned long Aln = 0);
    unsigned long Allocate(unsigned long ItemSize);
    unsigned long WriteString(const char *String,unsigned long Len = (unsigned long)-1);

-   inline unsigned long WriteString(const string &S) {return WriteString(S.c_str(),S.length());};
+   inline unsigned long WriteString(const std::string &S) {return WriteString(S.c_str(),S.length());};

    void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;};
    
    DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &WorkSpace = 2*1024*1024,
    void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;};
    
    DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &WorkSpace = 2*1024*1024,