Use std::unique_ptr for StreamFilter instead of std::shared_ptr

This commit is contained in:
Tatsuhiro Tsujikawa
2013-07-04 00:39:11 +09:00
parent cb205a207c
commit 57f1902ee1
16 changed files with 91 additions and 92 deletions

View File

@@ -30,30 +30,29 @@ class GZipDecodingStreamFilterTest:public CppUnit::TestFixture {
public:
MockSegment2():positionToWrite_(0) {}
virtual void updateWrittenLength(int32_t bytes)
virtual void updateWrittenLength(int32_t bytes) override
{
positionToWrite_ += bytes;
}
virtual int64_t getPositionToWrite() const
virtual int64_t getPositionToWrite() const override
{
return positionToWrite_;
}
};
std::shared_ptr<GZipDecodingStreamFilter> filter_;
std::shared_ptr<SinkStreamFilter> sinkFilter_;
std::unique_ptr<GZipDecodingStreamFilter> filter_;
std::shared_ptr<ByteArrayDiskWriter> writer_;
std::shared_ptr<MockSegment2> segment_;
public:
void setUp()
{
writer_.reset(new ByteArrayDiskWriter());
sinkFilter_.reset(new SinkStreamFilter());
filter_.reset(new GZipDecodingStreamFilter(sinkFilter_));
sinkFilter_->init();
writer_ = std::make_shared<ByteArrayDiskWriter>();
auto sinkFilter = make_unique<SinkStreamFilter>();
sinkFilter->init();
filter_ = make_unique<GZipDecodingStreamFilter>(std::move(sinkFilter));
filter_->init();
segment_.reset(new MockSegment2());
segment_ = std::make_shared<MockSegment2>();
}
void testTransform();