SourceFormat Enforcement

[thirdparty/squid.git] / src / acl / Ip.h

diff --git a/src/acl/Ip.h b/src/acl/Ip.h
index d1db9e2ebe6816c6a6d539ea68c2a2e050a3ab6d..4488d9b936dad91982c43d60d1808fd723713420 100644 (file)
--- a/src/acl/Ip.h
+++ b/src/acl/Ip.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -14,12 +14,11 @@
 #include "ip/Address.h"
 #include "splay.h"
 
-/// \ingroup ACLAPI
 class acl_ip_data
 {
+    MEMPROXY_CLASS(acl_ip_data);
 
 public:
-    MEMPROXY_CLASS(acl_ip_data);
     static acl_ip_data *FactoryParse(char const *);
     static int NetworkCompare(acl_ip_data * const & a, acl_ip_data * const &b);
 
@@ -35,19 +34,15 @@ public:
 
     Ip::Address mask; /**< \todo This should perhapse be stored as a CIDR range now instead of a full IP mask. */
 
-    acl_ip_data *next;         /**< used for parsing, not for storing */
+    acl_ip_data *next;      /**< used for parsing, not for storing */
 
 private:
 
     static bool DecodeMask(const char *asc, Ip::Address &mask, int string_format_type);
 };
 
-MEMPROXY_CLASS_INLINE(acl_ip_data);
-
-/// \ingroup ACLAPI
 class ACLIP : public ACL
 {
-
 public:
     void *operator new(size_t);
     void operator delete(void *);
@@ -57,7 +52,7 @@ public:
 
     ~ACLIP();
 
-    typedef SplayNode<acl_ip_data *> IPSplay;
+    typedef Splay<acl_ip_data *> IPSplay;
 
     virtual char const *typeString() const = 0;
     virtual void parse();
@@ -71,8 +66,7 @@ protected:
     int match(Ip::Address &);
     IPSplay *data;
 
-private:
-    static void DumpIpListWalkee(acl_ip_data * const & ip, void *state);
 };
 
 #endif /* SQUID_ACLIP_H */
+