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.

1 files changed, 9 insertions, 5 deletions

diff --git a/src/FileAllocationEntry.h b/src/FileAllocationEntry.h
index c5be8968..84426795 100644
--- a/src/FileAllocationEntry.h
+++ b/src/FileAllocationEntry.h
@@ -36,16 +36,18 @@
 #define _D_FILE_ALLOCATION_ENTRY_H_
 
 #include "RequestGroupEntry.h"
+#include "ProgressAwareEntry.h"
+#include <deque>
+
+namespace aria2 {
 
 class FileAllocationIterator;
-typedef SharedHandle<FileAllocationIterator> FileAllocationIteratorHandle;
 class Command;
-typedef deque<Command*> Commands;
 class DownloadEngine;
 
 class FileAllocationEntry : public RequestGroupEntry, public ProgressAwareEntry {
 private:
-  FileAllocationIteratorHandle _fileAllocationIterator;
+  SharedHandle<FileAllocationIterator> _fileAllocationIterator;
 public:
   FileAllocationEntry(RequestGroup* requestGroup, Command* nextCommand = 0);
 
@@ -59,10 +61,12 @@ public:
 
   void allocateChunk();
 
-  virtual Commands prepareForNextAction(DownloadEngine* e) = 0;
+  virtual std::deque<Command*> prepareForNextAction(DownloadEngine* e) = 0;
 };
 
 typedef SharedHandle<FileAllocationEntry> FileAllocationEntryHandle;
-typedef deque<FileAllocationEntryHandle> FileAllocationEntries;
+typedef std::deque<FileAllocationEntryHandle> FileAllocationEntries;
+
+} // namespace aria2
 
 #endif // _D_FILE_ALLOCATION_ENTRY_H_