diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
| commit | 7cb543fb742a837c4931513674febaec5e4c1401 (patch) | |
| tree | ddefe5b9329907818aa6eb3b593f555b29ccb869 /apt-inst/extract.h | |
| parent | f6cb0880a4b5d31e398cceb2e2577b6b82f4fffb (diff) | |
| parent | 71ecaad29d8066a494f516efc5efd80860653fe2 (diff) | |
merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2) and resolved a bunch of conflicts
Diffstat (limited to 'apt-inst/extract.h')
| -rw-r--r-- | apt-inst/extract.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-inst/extract.h b/apt-inst/extract.h index 71222983c..7143fa409 100644 --- a/apt-inst/extract.h +++ b/apt-inst/extract.h @@ -33,7 +33,7 @@ class pkgExtract : public pkgDirStream bool HandleOverwrites(pkgFLCache::NodeIterator Nde, bool DiverCheck = false); - bool CheckDirReplace(string Dir,unsigned int Depth = 0); + bool CheckDirReplace(std::string Dir,unsigned int Depth = 0); public: |