From 57f1902ee1fd24e2fa94a5e5c0ee357335366d7d Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 4 Jul 2013 00:39:11 +0900 Subject: Use std::unique_ptr for StreamFilter instead of std::shared_ptr --- test/ChunkedDecodingStreamFilterTest.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/ChunkedDecodingStreamFilterTest.cc') diff --git a/test/ChunkedDecodingStreamFilterTest.cc b/test/ChunkedDecodingStreamFilterTest.cc index 06af8761..9031b9c7 100644 --- a/test/ChunkedDecodingStreamFilterTest.cc +++ b/test/ChunkedDecodingStreamFilterTest.cc @@ -9,6 +9,7 @@ #include "ByteArrayDiskWriter.h" #include "SinkStreamFilter.h" #include "MockSegment.h" +#include "a2functional.h" namespace aria2 { @@ -24,8 +25,7 @@ class ChunkedDecodingStreamFilterTest:public CppUnit::TestFixture { CPPUNIT_TEST(testGetName); CPPUNIT_TEST_SUITE_END(); - std::shared_ptr filter_; - std::shared_ptr sinkFilter_; + std::unique_ptr filter_; std::shared_ptr writer_; std::shared_ptr segment_; @@ -36,12 +36,12 @@ class ChunkedDecodingStreamFilterTest:public CppUnit::TestFixture { public: void setUp() { - writer_.reset(new ByteArrayDiskWriter()); - sinkFilter_.reset(new SinkStreamFilter()); - filter_.reset(new ChunkedDecodingStreamFilter(sinkFilter_)); - sinkFilter_->init(); + writer_ = std::make_shared(); + auto sinkFilter = make_unique(); + sinkFilter->init(); + filter_ = make_unique(std::move(sinkFilter)); filter_->init(); - segment_.reset(new MockSegment()); + segment_ = std::make_shared(); } void testTransform(); -- cgit