From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 17 May 2013 11:07:15 +0000 (-0600)
Subject: Polish: convert ACLFilledChecklist to CBDATA_CLASS2
X-Git-Tag: SQUID_3_4_0_1~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5975ff703a91a5202f3ec8b6f14acf69ab94aef;p=thirdparty%2Fsquid.git

Polish: convert ACLFilledChecklist to CBDATA_CLASS2
---

diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc
index a68fdccc78..40cfa7d4fa 100644
--- a/src/acl/FilledChecklist.cc
+++ b/src/acl/FilledChecklist.cc
@@ -13,22 +13,6 @@
 
 CBDATA_CLASS_INIT(ACLFilledChecklist);
 
-void *
-ACLFilledChecklist::operator new (size_t size)
-{
-    assert (size == sizeof(ACLFilledChecklist));
-    CBDATA_INIT_TYPE(ACLFilledChecklist);
-    ACLFilledChecklist *result = cbdataAlloc(ACLFilledChecklist);
-    return result;
-}
-
-void
-ACLFilledChecklist::operator delete (void *address)
-{
-    ACLFilledChecklist *t = static_cast<ACLFilledChecklist *>(address);
-    cbdataFree(t);
-}
-
 ACLFilledChecklist::ACLFilledChecklist() :
         dst_peer(NULL),
         dst_rdns(NULL),
@@ -194,4 +178,3 @@ ACLFilledChecklist::ACLFilledChecklist(const acl_access *A, HttpRequest *http_re
         xstrncpy(rfc931, ident, USER_IDENT_SZ);
 #endif
 }
-
diff --git a/src/acl/FilledChecklist.h b/src/acl/FilledChecklist.h
index 362711bf9f..7e22e3d7aa 100644
--- a/src/acl/FilledChecklist.h
+++ b/src/acl/FilledChecklist.h
@@ -22,9 +22,6 @@ class HttpReply;
 class ACLFilledChecklist: public ACLChecklist
 {
 public:
-    void *operator new(size_t);
-    void operator delete(void *);
-
     ACLFilledChecklist();
     ACLFilledChecklist(const acl_access *, HttpRequest *, const char *ident);
     ~ACLFilledChecklist();
@@ -89,7 +86,7 @@ private:
     /// not implemented; will cause link failures if used
     ACLFilledChecklist &operator=(const ACLFilledChecklist &);
 
-    CBDATA_CLASS(ACLFilledChecklist);
+    CBDATA_CLASS2(ACLFilledChecklist);
 };
 
 /// convenience and safety wrapper for dynamic_cast<ACLFilledChecklist*>