From: robertc <>
Date: Sun, 18 May 2003 04:54:29 +0000 (+0000)
Subject: Summary: Rollback more inappropriate changes.
X-Git-Tag: SQUID_3_0_PRE1~184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=607e0693202bb360c4799f6cab927dce0c63e94e;p=thirdparty%2Fsquid.git

Summary: Rollback more inappropriate changes.
Keywords:

Rollback more inappropriate changes.
---

diff --git a/src/DelayId.cc b/src/DelayId.cc
index 0f6fb61d75..8201fc01ce 100644
--- a/src/DelayId.cc
+++ b/src/DelayId.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayId.cc,v 1.8 2003/05/15 07:16:50 robertc Exp $
+ * $Id: DelayId.cc,v 1.9 2003/05/17 22:54:29 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -103,7 +103,7 @@ DelayId::DelayClient(clientHttpRequest * http)
         return DelayId();
     }
 
-    for (pool = 0; pool < poolSet->pools(); pool++) {
+    for (pool = 0; pool < DelayPools::pools(); pool++) {
         ACLChecklist ch;
         ch.src_addr = r->client_addr;
         ch.my_addr = r->my_addr;
@@ -114,10 +114,10 @@ DelayId::DelayClient(clientHttpRequest * http)
 
         ch.request = requestLink(r);
 
-        if (poolSet->pool(pool).theComposite().getRaw() &&
-                aclCheckFast(poolSet->pool(pool).access, &ch)) {
+        if (DelayPools::delay_data[pool].theComposite().getRaw() &&
+                aclCheckFast(DelayPools::delay_data[pool].access, &ch)) {
             DelayId result (pool + 1);
-            result.compositePosition(poolSet->pool(pool).theComposite()->id(ch.src_addr, r->auth_user_request));
+            result.compositePosition(DelayPools::delay_data[pool].theComposite()->id(ch.src_addr, r->auth_user_request));
             return result;
         }
     }