From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 1 Mar 2015 01:44:26 +0000 (-0800)
Subject: Cleanup: convert BodyPipe to MEMPROXY_CLASS
X-Git-Tag: merge-candidate-3-v1~236
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27186b2c36f07115e096b6b76fc6b93ebbab2c80;p=thirdparty%2Fsquid.git

Cleanup: convert BodyPipe to MEMPROXY_CLASS

BodyPipe is ref-counted. Such classes should not be using CBDATA_CLASS
for smart pointer referencing and memory management. They use RefCount
for smart pointer referencing, MEMPROXY_CLASS for memory management.
---

diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc
index 44dacd9438..7731bf05bb 100644
--- a/src/BodyPipe.cc
+++ b/src/BodyPipe.cc
@@ -11,8 +11,6 @@
 #include "base/TextException.h"
 #include "BodyPipe.h"
 
-CBDATA_CLASS_INIT(BodyPipe);
-
 // BodySink is a BodyConsumer class which  just consume and drops
 // data from a BodyPipe
 class BodySink: public BodyConsumer
diff --git a/src/BodyPipe.h b/src/BodyPipe.h
index f75bff2056..e69b9067d7 100644
--- a/src/BodyPipe.h
+++ b/src/BodyPipe.h
@@ -89,7 +89,7 @@ private:
  */
 class BodyPipe: public RefCountable
 {
-    CBDATA_CLASS(BodyPipe);
+    MEMPROXY_CLASS(BodyPipe);
 
 public:
     typedef RefCount<BodyPipe> Pointer;