Summary: Really fixup HEAD builds.

Keywords:

DelayVector has incorrect case on update registration calls.
ACLChecklist inline methods were incorrect (or in the wrong file):
  .cci files are for conditionally inline methods.
  inline qualifier should not be used on conditionally inlined code.
  as member functions matchAclList[Slow|Fast] need to be declared thusly.
  The ACLChecklist header had not been updated to include the .cci file when
  inlining was enabled.

diff --git a/src/ACLChecklist.cci b/src/ACLChecklist.cci
index 25fb0341d68d1191130da49573446968f1b76c08..907ad559c2cd593aff7982e2f08068081d6567c7 100644 (file)
--- a/src/ACLChecklist.cci
+++ b/src/ACLChecklist.cci
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLChecklist.cci,v 1.1 2003/05/17 17:35:03 hno Exp $
+ * $Id: ACLChecklist.cci,v 1.2 2003/05/19 09:11:31 robertc Exp $
  *
  * DEBUG: none
  * AUTHOR: Henrik Nordstrom
@@ -32,8 +32,14 @@
  *
  */
 
-inline void matchAclListFast(const acl_list * list)
+void
+ACLChecklist::matchAclListFast(const acl_list * list)
 {
     matchAclList(list, true);
-    inline void matchAclListSlow(const acl_list * list) {
-        matchAclList(list, false);
+}
+
+void
+ACLChecklist::matchAclListSlow(const acl_list * list)
+{
+    matchAclList(list, false);
+}

diff --git a/src/ACLChecklist.h b/src/ACLChecklist.h
index d195cf513e2cb86e096c5e0e3da54b267f7e7ffe..82694d7787d110a84e13b6a5e438307e0ea0e05b 100644 (file)
--- a/src/ACLChecklist.h
+++ b/src/ACLChecklist.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLChecklist.h,v 1.9 2003/05/17 17:35:03 hno Exp $
+ * $Id: ACLChecklist.h,v 1.10 2003/05/19 09:11:31 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -88,8 +88,8 @@ class NullState : public AsyncState
 
     void nonBlockingCheck(PF * callback, void *callback_data);
     void checkCallback(allow_t answer);
-    void matchAclListFast(const acl_list * list);
-    void matchAclListSlow(const acl_list * list);
+    void _SQUID_INLINE_ matchAclListFast(const acl_list * list);
+    void _SQUID_INLINE_ matchAclListSlow(const acl_list * list);
     ConnStateData *conn();
     void conn(ConnStateData *);
     int authenticated();
@@ -152,4 +152,8 @@ SQUIDCEXTERN ACLChecklist *aclChecklistCreate(const acl_access *,
         const char *ident);
 SQUIDCEXTERN int aclCheckFast(const acl_access *A, ACLChecklist *);
 
+#ifdef _USE_INLINE_
+#include "ACLChecklist.cci"
+#endif
+
 #endif /* SQUID_ACLCHECKLIST_H */

diff --git a/src/DelayVector.cc b/src/DelayVector.cc
index 0d48b6c078ea3161d6be9a8d4586a3bb06746902..dde2aae8868b9ace138cc5f8dd9fb896c9c436a5 100644 (file)
--- a/src/DelayVector.cc
+++ b/src/DelayVector.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayVector.cc,v 1.6 2003/05/15 07:06:24 robertc Exp $
+ * $Id: DelayVector.cc,v 1.7 2003/05/19 09:11:30 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -66,12 +66,12 @@ DelayVector::deleteSelf() const
 
 DelayVector::DelayVector()
 {
-    DelayPools::RegisterForUpdates (this);
+    DelayPools::registerForUpdates (this);
 }
 
 DelayVector::~DelayVector()
 {
-    DelayPools::DeregisterForUpdates (this);
+    DelayPools::deregisterForUpdates (this);
 }
 
 void