delay pools MSVC compatability from Guido Serassio

diff --git a/src/DelayTagged.h b/src/DelayTagged.h
index 9b5186624d9bb6674d9d5320970f8a568bdc8553..85fb119cd5fc1c1d7102e39ba6f09ca904f81c7f 100644 (file)
--- a/src/DelayTagged.h
+++ b/src/DelayTagged.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayTagged.h,v 1.2 2003/05/22 10:14:09 robertc Exp $
+ * $Id: DelayTagged.h,v 1.3 2003/08/03 09:03:48 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -91,14 +91,14 @@ class Id:public DelayIdComposite
         void *operator new(size_t);
         void operator delete (void *);
         virtual void deleteSelf() const;
-        Id (DelayTagged::Pointer, String &);
+        Id (RefCount<DelayTagged>, String &);
         ~Id();
         virtual int bytesWanted (int min, int max) const;
         virtual void bytesIn(int qty);
         virtual void delayRead(DeferredRead const &);
 
     private:
-        DelayTagged::Pointer theTagged;
+        RefCount<DelayTagged> theTagged;
         DelayTaggedBucket::Pointer theBucket;
     };
 

diff --git a/src/DelayUser.h b/src/DelayUser.h
index 5a3caea621fb151ed6f3002b037c5d8e3d8857ec..f3ac3ce46ed3107dadcb4ea1382784e1268f9f54 100644 (file)
--- a/src/DelayUser.h
+++ b/src/DelayUser.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayUser.h,v 1.5 2003/05/20 12:17:38 robertc Exp $
+ * $Id: DelayUser.h,v 1.6 2003/08/03 09:03:48 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -91,13 +91,13 @@ class Id:public DelayIdComposite
         void *operator new(size_t);
         void operator delete (void *);
         virtual void deleteSelf() const;
-        Id (DelayUser::Pointer, AuthUser *);
+        Id (RefCount<DelayUser>, AuthUser *);
         ~Id();
         virtual int bytesWanted (int min, int max) const;
         virtual void bytesIn(int qty);
 
     private:
-        DelayUser::Pointer theUser;
+        RefCount<DelayUser> theUser;
         DelayUserBucket::Pointer theBucket;
     };
 

diff --git a/src/DelayVector.h b/src/DelayVector.h
index ddf49b8fa3a1c29d413ea46918a8ad4f801ace50..42a2eb328c8278b1d48644b509acd2ed3a41a1ba 100644 (file)
--- a/src/DelayVector.h
+++ b/src/DelayVector.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayVector.h,v 1.7 2003/05/20 12:17:38 robertc Exp $
+ * $Id: DelayVector.h,v 1.8 2003/08/03 09:03:48 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -66,14 +66,14 @@ class Id:public DelayIdComposite
         void operator delete (void *);
         virtual void deleteSelf() const;
 
-        Id (DelayVector::Pointer,CompositeSelectionDetails &);
+        Id (RefCount<DelayVector>,CompositeSelectionDetails &);
         ~Id();
         virtual int bytesWanted (int min, int max) const;
         virtual void bytesIn(int qty);
         virtual void delayRead(DeferredRead const &);
 
     private:
-        DelayVector::Pointer theVector;
+        RefCount<DelayVector> theVector;
         Vector<DelayIdComposite::Pointer> ids;
         typedef Vector<DelayIdComposite::Pointer>::iterator iterator;
         typedef Vector<DelayIdComposite::Pointer>::const_iterator const_iterator;

diff --git a/src/delay_pools.cc b/src/delay_pools.cc
index 35e884a4f479c3b5b6175e334c5204fffb7689b8..5e64625a7542014bcbd015c858be5f519a562fb8 100644 (file)
--- a/src/delay_pools.cc
+++ b/src/delay_pools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: delay_pools.cc,v 1.40 2003/06/19 13:12:05 robertc Exp $
+ * $Id: delay_pools.cc,v 1.41 2003/08/03 09:03:49 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -92,13 +92,13 @@ class AggregateId:public DelayIdComposite
         void *operator new(size_t);
         void operator delete (void *);
         virtual void deleteSelf() const;
-        AggregateId (Aggregate::Pointer);
+        AggregateId (RefCount<Aggregate>);
         virtual int bytesWanted (int min, int max) const;
         virtual void bytesIn(int qty);
         virtual void delayRead(DeferredRead const &);
 
     private:
-        Aggregate::Pointer theAggregate;
+        RefCount<Aggregate> theAggregate;
     };
 
     friend class AggregateId;
@@ -162,12 +162,12 @@ class Id:public DelayIdComposite
         void *operator new(size_t);
         void operator delete (void *);
         virtual void deleteSelf() const;
-        Id (VectorPool::Pointer, int);
+        Id (RefCount<VectorPool>, int);
         virtual int bytesWanted (int min, int max) const;
         virtual void bytesIn(int qty);
 
     private:
-        VectorPool::Pointer theVector;
+        RefCount<VectorPool> theVector;
         int theIndex;
     };
 };
@@ -259,12 +259,12 @@ class Id:public DelayIdComposite
         void *operator new(size_t);
         void operator delete (void *);
         virtual void deleteSelf() const;
-        Id (ClassCHostPool::Pointer, unsigned char, unsigned char);
+        Id (RefCount<ClassCHostPool>, unsigned char, unsigned char);
         virtual int bytesWanted (int min, int max) const;
         virtual void bytesIn(int qty);
 
     private:
-        ClassCHostPool::Pointer theClassCHost;
+        RefCount<ClassCHostPool> theClassCHost;
         unsigned char theNet;
         unsigned char theHost;
     };
@@ -542,7 +542,7 @@ Aggregate::AggregateId::deleteSelf() const
     delete this;
 }
 
-Aggregate::AggregateId::AggregateId(Aggregate::Pointer anAggregate) : theAggregate(anAggregate)
+Aggregate::AggregateId::AggregateId(RefCount<Aggregate> anAggregate) : theAggregate(anAggregate)
 {}
 
 int