summaryrefslogtreecommitdiff
path: root/apt-inst/contrib/extracttar.h
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-05-23 21:06:09 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-05-23 21:06:09 +0000
commit42ab8223d52672cf28c6e2e574bb364c438bd49a (patch)
tree4f7fe5477b4e30079a96dcc16b720b434a59e485 /apt-inst/contrib/extracttar.h
parentd658f6f5e1071aaba845a3c1216d96d50f399189 (diff)
* merged with my apt--fixes--0 branch
Patches applied: * apt@packages.debian.org/apt--misc-abi-changes--0--patch-4 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6 Collapse both pkgAcquire::Run() methods into one, with a default value * michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1 * merged obvious fixes into the tree to make it easy for matt to merge * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2 * more merges from otavio that looks good/uncritical * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3 * merged Matts misc-abi-changes tree * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4 * finalized the changelog for a ubuntu build * otavio@debian.org--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-71 * otavio@debian.org--2005/apt--fixes--0--patch-1 Fix comments about the need of xmlto * otavio@debian.org--2005/apt--fixes--0--patch-2 Fix a compile warning * otavio@debian.org--2005/apt--fixes--0--patch-3 Sync with apt--main--0--patch-76 * otavio@debian.org--2005/apt--fixes--0--patch-4 Sync with apt--main--0--patch-78 * otavio@debian.org--2005/apt--fixes--0--patch-5 Add fixes that was wrongly included on DDTP changes. * otavio@debian.org--2005/apt--fixes--0--patch-8 Add information about the other fixes include on this branch now. * otavio@debian.org--2005/apt--fixes--0--patch-9 Merge last changes from apt--main--0. * otavio@debian.org--2005/apt--fixes--0--patch-10 Fix warnings about min/max change in gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-11 Fix remaning warnings while compiling gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-12 Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler.
Diffstat (limited to 'apt-inst/contrib/extracttar.h')
-rw-r--r--apt-inst/contrib/extracttar.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index ec930ca22..6daf00a27 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -21,6 +21,10 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/dirstream.h>
+#include <algorithm>
+
+using std::min;
+
class ExtractTar
{
protected: