Cleanup: zap CVS Id tags

[thirdparty/squid.git] / src / ACLStrategised.h

diff --git a/src/ACLStrategised.h b/src/ACLStrategised.h
index 34538f12c328b209a699f20593e11f015c018621..0e344645237cc5c58214731a7a64296badef1fc2 100644 (file)
--- a/src/ACLStrategised.h
+++ b/src/ACLStrategised.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLStrategised.h,v 1.4 2003/07/14 08:21:56 robertc Exp $
+ * $Id$
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -19,12 +19,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -48,7 +48,6 @@ public:
     typedef M MatchType;
     void *operator new(size_t);
     void operator delete(void *);
-    virtual void deleteSelf() const;
 
     ~ACLStrategised();
     ACLStrategised(ACLData<MatchType> *, ACLStrategy<MatchType> *, char const *);
@@ -58,17 +57,20 @@ public:
     virtual char const *typeString() const;
     virtual bool requiresRequest() const {return matcher->requiresRequest();}
 
+    virtual bool requiresReply() const {return matcher->requiresReply();}
+
     virtual void prepareForUse() { data->prepareForUse();}
 
     virtual void parse();
     virtual int match(ACLChecklist *checklist);
     virtual int match (M const &);
     virtual wordlist *dump() const;
+    virtual bool empty () const;
     virtual bool valid () const;
     virtual ACL *clone()const;
 
 private:
-    static MemPool *Pool;
+    static MemAllocator *Pool;
     ACLData<MatchType> *data;
     char const *type_;
     ACLStrategy<MatchType> *matcher;
@@ -77,7 +79,7 @@ private:
 /* implementation follows */
 
 template <class MatchType>
-MemPool (*ACLStrategised<MatchType>::Pool)(NULL);
+MemAllocator *ACLStrategised<MatchType>::Pool = NULL;
 
 template <class MatchType>
 void *
@@ -89,27 +91,20 @@ ACLStrategised<MatchType>::operator new (size_t byteCount)
     if (!Pool)
         Pool = memPoolCreate("ACLStrategised", sizeof (ACLStrategised<MatchType>));
 
-    return memPoolAlloc(Pool);
+    return Pool->alloc();
 }
 
 template <class MatchType>
 void
 ACLStrategised<MatchType>::operator delete (void *address)
 {
-    memPoolFree (Pool, address);
-}
-
-template <class MatchType>
-void
-ACLStrategised<MatchType>::deleteSelf() const
-{
-    delete this;
+    Pool->free(address);
 }
 
 template <class MatchType>
 ACLStrategised<MatchType>::~ACLStrategised()
 {
-    data->deleteSelf();
+    delete data;
 }
 
 template <class MatchType>
@@ -143,6 +138,13 @@ ACLStrategised<MatchType>::parse()
     data->parse();
 }
 
+template <class MatchType>
+bool
+ACLStrategised<MatchType>::empty() const
+{
+    return data->empty();
+}
+
 template <class MatchType>
 int
 ACLStrategised<MatchType>::match(ACLChecklist *checklist)
@@ -168,7 +170,7 @@ template <class MatchType>
 bool
 ACLStrategised<MatchType>::valid () const
 {
-    return data != NULL;
+    return matcher->valid();
 }
 
 template <class MatchType>