From 63a0d0b6d10f51e202cc78b731d9f4d012a9325c Mon Sep 17 00:00:00 2001 From: Adam Malinowski Date: Mon, 28 Jul 2014 10:31:17 +0200 Subject: [PATCH] Remove unused bucket visitor mechanism from BinaryQueue class Change-Id: I0601ad50a6bb3ab9e1eba6323ba74faa1f07f51f --- src/common/containers/BinaryQueue.cpp | 22 ------------------- src/common/containers/BinaryQueue.h | 40 ----------------------------------- 2 files changed, 62 deletions(-) diff --git a/src/common/containers/BinaryQueue.cpp b/src/common/containers/BinaryQueue.cpp index b56f950..beab980 100644 --- a/src/common/containers/BinaryQueue.cpp +++ b/src/common/containers/BinaryQueue.cpp @@ -248,26 +248,4 @@ BinaryQueue::Bucket::~Bucket() { deleter(buffer, size, param); } -BinaryQueue::BucketVisitor::~BucketVisitor() { -} - -BinaryQueue::BucketVisitorCall::BucketVisitorCall(BucketVisitor *visitor) : - m_visitor(visitor) { -} - -BinaryQueue::BucketVisitorCall::~BucketVisitorCall() { -} - -void BinaryQueue::BucketVisitorCall::operator()(Bucket *bucket) const { - m_visitor->onVisitBucket(bucket->ptr, bucket->left); -} - -void BinaryQueue::visitBuckets(BucketVisitor *visitor) const { - if(visitor == nullptr) - throw NullPointerException("visitor"); - - // Visit all buckets - std::for_each(m_buckets.begin(), m_buckets.end(), BucketVisitorCall(visitor)); -} - } // namespace Cynara diff --git a/src/common/containers/BinaryQueue.h b/src/common/containers/BinaryQueue.h index ccfbffe..962a132 100644 --- a/src/common/containers/BinaryQueue.h +++ b/src/common/containers/BinaryQueue.h @@ -48,24 +48,6 @@ class BinaryQueue size_t bufferSize, void *userParam); - class BucketVisitor - { - public: - /** - * Destructor - */ - virtual ~BucketVisitor(); - - /** - * Visit bucket - * - * @return none - * @param[in] buffer Constant pointer to bucket data buffer - * @param[in] bufferSize Number of bytes in bucket - */ - virtual void onVisitBucket(const void *buffer, size_t bufferSize) = 0; - }; - private: struct Bucket { @@ -96,18 +78,6 @@ class BinaryQueue static void deleteBucket(Bucket *bucket); - class BucketVisitorCall - { - private: - BucketVisitor *m_visitor; - - public: - BucketVisitorCall(BucketVisitor *visitor); - virtual ~BucketVisitorCall(); - - void operator()(Bucket *bucket) const; - }; - public: /** * Construct empty binary queue @@ -269,16 +239,6 @@ class BinaryQueue * is larger than available bytes in binary queue */ void flattenConsume(void *buffer, size_t bufferSize); - - /** - * Visit each buffer with data using visitor object - * - * @return none - * @param[in] visitor Pointer to bucket visitor - * @see BinaryQueue::BucketVisitor - * @exception Cynara::NullPointerException visitor is nullptr - */ - void visitBuckets(BucketVisitor *visitor) const; }; } // namespace Cynara -- 2.7.4