From: Alex Rousskov Date: Tue, 30 Sep 2008 04:43:46 +0000 (-0600) Subject: Synced with libecap::Body simplifications. X-Git-Tag: SQUID_3_1_0_1~45^2~11^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=580d26d9244fe30b0be387ba341d0202fad3a3de;p=thirdparty%2Fsquid.git Synced with libecap::Body simplifications. --- diff --git a/src/eCAP/MessageRep.cc b/src/eCAP/MessageRep.cc index fc99cccafa..100caa76f9 100644 --- a/src/eCAP/MessageRep.cc +++ b/src/eCAP/MessageRep.cc @@ -317,26 +317,6 @@ Ecap::BodyRep::bodySize() const return !theBody ? BodySize() : BodySize(theBody->bodySize()); } -Ecap::BodyRep::size_type -Ecap::BodyRep::consumedSize() const -{ - return theBody->consumedSize(); -} - -bool -Ecap::BodyRep::productionEnded() const -{ - return theBody->productionEnded(); -} - -Ecap::BodyRep::Area -Ecap::BodyRep::prefix(Ecap::BodyRep::size_type size) const -{ - Must(size <= static_cast(theBody->buf().contentSize())); - // XXX: optimize by making theBody a shared_ptr (see FromTemp*() src) - return Area::FromTempBuffer(theBody->buf().content(), size); -} - /* MessageRep */ diff --git a/src/eCAP/MessageRep.h b/src/eCAP/MessageRep.h index ee6ec340c1..74032664d0 100644 --- a/src/eCAP/MessageRep.h +++ b/src/eCAP/MessageRep.h @@ -119,9 +119,7 @@ private: class BodyRep: public libecap::Body { public: - typedef libecap::Area Area; typedef libecap::BodySize BodySize; - using libecap::Body::size_type; public: BodyRep(const BodyPipe::Pointer &aBody); // using NULL pointer? see tie() @@ -130,9 +128,6 @@ public: // libecap::Body API virtual BodySize bodySize() const; - virtual size_type consumedSize() const; - virtual bool productionEnded() const; - virtual Area prefix(size_type size) const; private: BodyPipe::Pointer theBody; // the body being translated to libecap