From 93641593cafac296b9072288d8ef9e1a526d745b Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:51:08 +0000
Subject: Upgraded to eg++ 1.1 and libstdc++2.9 Author: jgg Date: 1998-10-20
 04:33:11 GMT Upgraded to eg++ 1.1 and libstdc++2.9

---
 apt-pkg/acquire-worker.cc  | 3 ++-
 apt-pkg/algorithms.cc      | 3 +--
 apt-pkg/contrib/fileutl.cc | 4 ++--
 apt-pkg/pkgcache.cc        | 4 ++--
 apt-pkg/sourcelist.cc      | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 5bd30b7b1..688c5e220 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.2 1998/10/20 02:39:13 jgg Exp $
+// $Id: acquire-worker.cc,v 1.3 1998/10/20 04:33:12 jgg Exp $
 /* ######################################################################
 
    Acquire Worker 
@@ -23,6 +23,7 @@
 
 #include <unistd.h>
 #include <signal.h>
+#include <wait.h>
 									/*}}}*/
 
 // Worker::Worker - Constructor for Queue startup			/*{{{*/
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 755474e15..185e3400e 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: algorithms.cc,v 1.6 1998/10/20 02:39:17 jgg Exp $
+// $Id: algorithms.cc,v 1.7 1998/10/20 04:33:13 jgg Exp $
 /* ######################################################################
 
    Algorithms - A set of misc algorithms
@@ -904,7 +904,6 @@ bool pkgProblemResolver::ResolveByKeep()
 	 
 	 // Look at all the possible provides on this package
 	 pkgCache::Version **VList = End.AllTargets();
-	 bool Done = false;
 	 for (pkgCache::Version **V = VList; *V != 0; V++)
 	 {
 	    pkgCache::VerIterator Ver(Cache,*V);
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index cc0363da5..bfc674c62 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: fileutl.cc,v 1.9 1998/10/20 02:39:28 jgg Exp $
+// $Id: fileutl.cc,v 1.10 1998/10/20 04:33:16 jgg Exp $
 /* ######################################################################
    
    File Utilities
@@ -137,7 +137,7 @@ void SetCloseExec(int Fd,bool Close)
 void SetNonBlock(int Fd,bool Block)
 {   
    int Flags = fcntl(Fd,F_GETFL);
-   if (fcntl(Fd,F_SETFL,(Block == false)?0:O_NONBLOCK) != 0)
+   if (fcntl(Fd,F_SETFL,(Flags  & ~O_NONBLOCK) | (Block == false)?0:O_NONBLOCK) != 0)
    {
       cerr << "FATAL -> Could not set non-blocking flag " << strerror(errno) << endl;
       exit(100);
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 13e33dc4f..a73cb410b 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: pkgcache.cc,v 1.11 1998/10/08 05:05:05 jgg Exp $
+// $Id: pkgcache.cc,v 1.12 1998/10/20 04:33:14 jgg Exp $
 /* ######################################################################
    
    Package Cache - Accessor code for the cache
@@ -346,7 +346,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets()
 const char *pkgCache::DepIterator::CompType()
 {
    const char *Ops[] = {"","<=",">=","<",">","=","!="};
-   if ((Dep->CompareOp & 0xF) < sizeof(Ops))
+   if ((unsigned)(Dep->CompareOp & 0xF) < sizeof(Ops))
       return Ops[Dep->CompareOp & 0xF];
    return "";	 
 }
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index e6200d3be..c3fb5642f 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: sourcelist.cc,v 1.7 1998/10/20 02:39:24 jgg Exp $
+// $Id: sourcelist.cc,v 1.8 1998/10/20 04:33:15 jgg Exp $
 /* ######################################################################
 
    List of Sources
@@ -114,7 +114,7 @@ bool pkgSourceList::Read(string File)
    debugging. */
 ostream &operator <<(ostream &O,pkgSourceList::Item &Itm)
 {
-   O << Itm.Type << ' ' << Itm.URI << ' ' << Itm.Dist << ' ' << Itm.Section;
+   O << (int)Itm.Type << ' ' << Itm.URI << ' ' << Itm.Dist << ' ' << Itm.Section;
    return O;
 }
 									/*}}}*/
-- 
cgit v1.2.3