From 1b7c1982896dba1d38e1fe84ba9660996607f5f9 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 8 Feb 2008 15:53:45 +0000
Subject: 2008-02-08  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>

	Removed "using namespace std;" from all sources. Appended std::
prefix to c++
	standard classes.
	Included string.h where mem* function are used.
---
 src/MultiFileAllocationIterator.h | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/MultiFileAllocationIterator.h')

diff --git a/src/MultiFileAllocationIterator.h b/src/MultiFileAllocationIterator.h
index a9b4aa8a..4e79b599 100644
--- a/src/MultiFileAllocationIterator.h
+++ b/src/MultiFileAllocationIterator.h
@@ -36,23 +36,25 @@
 #define _D_MULTI_FILE_ALLOCATION_ITERATOR_H_
 
 #include "FileAllocationIterator.h"
+#include <deque>
+
+namespace aria2 {
 
 class MultiDiskAdaptor;
 class DiskWriterEntry;
-typedef SharedHandle<DiskWriterEntry> DiskWriterEntryHandle;
-typedef deque<DiskWriterEntryHandle> DiskWriterEntries;
 class SingleFileAllocationIterator;
-typedef SharedHandle<SingleFileAllocationIterator> SingleFileAllocationIteratorHandle;
 
 class MultiFileAllocationIterator:public FileAllocationIterator
 {
 private:
   MultiDiskAdaptor* _diskAdaptor;
-  DiskWriterEntries _entries;
-  SingleFileAllocationIteratorHandle _fileAllocationIterator;
+  std::deque<SharedHandle<DiskWriterEntry> > _entries;
+  SharedHandle<SingleFileAllocationIterator> _fileAllocationIterator;
   int64_t _offset;
 
-  DiskWriterEntries makeDiskWriterEntries(const DiskWriterEntries& srcEntries, int32_t pieceLength) const;
+  std::deque<SharedHandle<DiskWriterEntry> >
+  makeDiskWriterEntries(const std::deque<SharedHandle<DiskWriterEntry> >& srcEntries,
+			int32_t pieceLength) const;
 public:
   MultiFileAllocationIterator(MultiDiskAdaptor* diskAdaptor);
 
@@ -66,9 +68,11 @@ public:
 
   virtual int64_t getTotalLength();
 
-  const DiskWriterEntries& getDiskWriterEntries() const;
+  const std::deque<SharedHandle<DiskWriterEntry> >& getDiskWriterEntries() const;
 };
 
 typedef SharedHandle<MultiFileAllocationIterator> MultiFileAllocationIteratorHandle;
 
+} // namespace aria2
+
 #endif // _D_MULTI_FILE_ALLOCATION_ITERATOR_H_
-- 
cgit