Cleanup: zap CVS Id tags

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

diff --git a/src/ExternalACL.h b/src/ExternalACL.h
index bb35bed64b32ada20606e2c2725596b9a1cfccc6..11c1cbf9d79f7c026f69cfd8c7a651f8975e4b1f 100644 (file)
--- a/src/ExternalACL.h
+++ b/src/ExternalACL.h
@@ -1,6 +1,5 @@
-
 /*
- * $Id: ExternalACL.h,v 1.4 2003/05/20 12:17:38 robertc Exp $
+ * $Id$
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -19,12 +18,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.
@@ -32,10 +31,9 @@
  *
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
-
 #ifndef SQUID_EXTERNALACL_H
 #define SQUID_EXTERNALACL_H
-#include "ACL.h"
+
 #include "ACLChecklist.h"
 
 class external_acl;
@@ -52,15 +50,16 @@ private:
     static void LookupDone(void *data, void *result);
 };
 
+/** \todo CLEANUP: kill this typedef. */
 typedef struct _external_acl_data external_acl_data;
 
+#include "ACL.h"
+
 class ACLExternal : public ACL
 {
 
 public:
-    void *operator new(size_t);
-    void operator delete(void *);
-    virtual void deleteSelf() const;
+    MEMPROXY_CLASS(ACLExternal);
 
     static void ExternalAclLookup(ACLChecklist * ch, ACLExternal *, EAH * callback, void *callback_data);
 
@@ -79,17 +78,18 @@ public:
 
     /* when requiresRequest is made dynamic, review this too */
     //    virtual bool requiresReply() const {return true;}
-    /* This may need to be extant, to cause 407's if %LOGIN% is used. */
-    //    virtual bool isProxyAuth() const {return true;}
+    virtual bool isProxyAuth() const;
     virtual wordlist *dump() const;
     virtual bool valid () const;
+    virtual bool empty () const;
 
 protected:
-    static MemPool *Pool;
     static Prototype RegistryProtoype;
     static ACLExternal RegistryEntry_;
     external_acl_data *data;
     char const *class_;
 };
 
+MEMPROXY_CLASS_INLINE(ACLExternal);
+
 #endif /* SQUID_EXTERNALACL_H */