diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:00 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:00 +0000 |
| commit | 24a0d63a0285b4f656fe6ef63d2fb413c24eece1 (patch) | |
| tree | 65643a6b0079ff02aab88c766fd32ddfb90527e3 /apt-pkg/acquire-worker.cc | |
| parent | b4fc9b6f648694ecb0d161cb14859da88b36881c (diff) | |
G++3 fixes from Randolph
Author: jgg
Date: 2001-05-22 04:42:54 GMT
G++3 fixes from Randolph
Diffstat (limited to 'apt-pkg/acquire-worker.cc')
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 3b354c9f9..5cd7d6f1e 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-worker.cc,v 1.33 2001/03/23 01:47:14 jgg Exp $ +// $Id: acquire-worker.cc,v 1.34 2001/05/22 04:42:54 jgg Exp $ /* ###################################################################### Acquire Worker @@ -23,6 +23,9 @@ #include <apt-pkg/strutl.h> #include <apti18n.h> + +#include <iostream> +#include <fstream> #include <sys/stat.h> #include <unistd.h> @@ -32,6 +35,8 @@ #include <errno.h> /*}}}*/ +using namespace std; + // Worker::Worker - Constructor for Queue startup /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -128,7 +133,6 @@ bool pkgAcquire::Worker::Start() // Setup the FDs dup2(Pipes[1],STDOUT_FILENO); dup2(Pipes[2],STDIN_FILENO); - dup2(((filebuf *)clog.rdbuf())->fd(),STDERR_FILENO); SetCloseExec(STDOUT_FILENO,false); SetCloseExec(STDIN_FILENO,false); SetCloseExec(STDERR_FILENO,false); @@ -462,7 +466,7 @@ bool pkgAcquire::Worker::OutFdReady() int Res; do { - Res = write(OutFd,OutQueue.begin(),OutQueue.length()); + Res = write(OutFd,OutQueue.c_str(),OutQueue.length()); } while (Res < 0 && errno == EINTR); |