From f000fd0cab7860920b5269c018ea3eaae9f35e2e Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 5 Jul 2013 21:08:24 +0900
Subject: MultiDiskAdaptor: Use std::unique_ptr for DiskWriterEntry and
 DiskWriter

MultiFileAllocationIterator is also rewritten so that it does not
requre copying DiskWriterEntry objects.
---
 src/MultiFileAllocationIterator.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/MultiFileAllocationIterator.h')

diff --git a/src/MultiFileAllocationIterator.h b/src/MultiFileAllocationIterator.h
index 388b891f..2f55d234 100644
--- a/src/MultiFileAllocationIterator.h
+++ b/src/MultiFileAllocationIterator.h
@@ -40,16 +40,17 @@
 #include <deque>
 #include <memory>
 
+#include "MultiDiskAdaptor.h"
+
 namespace aria2 {
 
-class MultiDiskAdaptor;
 class DiskWriterEntry;
 
 class MultiFileAllocationIterator:public FileAllocationIterator
 {
 private:
   MultiDiskAdaptor* diskAdaptor_;
-  std::deque<std::shared_ptr<DiskWriterEntry> > entries_;
+  DiskWriterEntries::const_iterator entryItr_;
   std::unique_ptr<FileAllocationIterator> fileAllocationIterator_;
 public:
   MultiFileAllocationIterator(MultiDiskAdaptor* diskAdaptor);
@@ -64,8 +65,7 @@ public:
 
   virtual int64_t getTotalLength();
 
-  const std::deque<std::shared_ptr<DiskWriterEntry> >&
-  getDiskWriterEntries() const;
+  const DiskWriterEntries& getDiskWriterEntries() const;
 };
 
 } // namespace aria2
-- 
cgit