diff options
author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:57 +0000 |
---|---|---|
committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:57 +0000 |
commit | 422d9f6e1887b3adbb2a8e6798c61390079a0965 (patch) | |
tree | d4ff9f7afc8588fc44e17e006e16016b7ce2b3d5 /apt-pkg | |
parent | c1ebf56dc8f868da52baed255c0a64ccb88cedf3 (diff) |
G++3 fixes from Randolph
Author: jgg
Date: 2001-05-14 05:16:43 GMT
G++3 fixes from Randolph
Diffstat (limited to 'apt-pkg')
-rw-r--r-- | apt-pkg/contrib/mmap.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 6285620c9..caffa0f90 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: mmap.h,v 1.11 1999/08/02 03:07:47 jgg Exp $ +// $Id: mmap.h,v 1.12 2001/05/14 05:16:43 jgg Exp $ /* ###################################################################### MMap Class - Provides 'real' mmap or a faked mmap using read(). @@ -32,6 +32,8 @@ #include <string> #include <apt-pkg/fileutl.h> +using std::string; + /* 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 instead of this internal type */ @@ -92,7 +94,7 @@ class DynamicMMap : public MMap unsigned long RawAllocate(unsigned 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(string S) {return WriteString(S.begin(),S.size());}; + inline unsigned long WriteString(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 WorkSpace = 2*1024*1024); |