Merged from trunk.

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

diff --git a/src/ACLASN.h b/src/ACLASN.h
index 65b4f00be9788d08ec0b70fd796cf92f380538f3..d6223adb2ed42047b65dcf86782901762cb09b2b 100644 (file)
--- a/src/ACLASN.h
+++ b/src/ACLASN.h
@@ -36,23 +36,16 @@
 #define SQUID_ACLASN_H
 
 #include "ACLData.h"
-#include "List.h"
+#include "CbDataList.h"
 #include "ACLStrategised.h"
 #include "ACLChecklist.h"
 #include "IPAddress.h"
 
-/* forward decls */
-
-class CacheManager;
-
-SQUIDCEXTERN int asnMatchIp(List<int> *, IPAddress &);
+SQUIDCEXTERN int asnMatchIp(CbDataList<int> *, IPAddress &);
 
 /// \ingroup ACLAPI
 SQUIDCEXTERN void asnInit(void);
 
-/// \ingroup ACLAPI
-extern void asnRegisterWithCacheManager(CacheManager & manager);
-
 /// \ingroup ACLAPI
 SQUIDCEXTERN void asnFreeMemory(void);
 
@@ -77,7 +70,7 @@ private:
     static ACLStrategised<IPAddress> SourceRegistryEntry_;
     static ACL::Prototype DestinationRegistryProtoype;
     static ACLStrategised<IPAddress> DestinationRegistryEntry_;
-    List<int> *data;
+    CbDataList<int> *data;
 };
 
 MEMPROXY_CLASS_INLINE(ACLASN)          /**DOCS_NOSEMI*/