2008-11-03 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Removed SingletonHolder of CUIDCounter. CUIDCounter is now part 
	of DownloadEngine.
	* src/ActivePeerConnectionCommand.cc
	* src/BtSetup.cc
	* src/CUIDCounter.h
	* src/DHTSetup.cc
	* src/DownloadCommand.cc
	* src/DownloadEngine.cc
	* src/DownloadEngine.h
	* src/DownloadEngineFactory.cc
	* src/FileAllocationDispatcherCommand.cc
	* src/InitiatorMSEHandshakeCommand.cc
	* src/PeerInitiateConnectionCommand.cc
	* src/PeerInteractionCommand.cc
	* src/PeerListenCommand.cc
	* src/RequestGroup.cc
	* src/StreamFileAllocationEntry.cc
	* src/TrackerWatcherCommand.cc
	* src/main.cc
	* test/RequestGroupManTest.cc

1 files changed, 4 insertions, 4 deletions

diff --git a/src/StreamFileAllocationEntry.cc b/src/StreamFileAllocationEntry.cc
index 9c6b9d31..e9ba48a0 100644
--- a/src/StreamFileAllocationEntry.cc
+++ b/src/StreamFileAllocationEntry.cc
@@ -33,14 +33,15 @@
  */
 /* copyright --> */
 #include "StreamFileAllocationEntry.h"
-#include "CUIDCounter.h"
+
+#include <algorithm>
+
 #include "DownloadEngine.h"
 #include "Option.h"
 #include "Request.h"
 #include "prefs.h"
 #include "RequestGroup.h"
 #include "InitiateConnectionCommandFactory.h"
-#include <algorithm>
 
 namespace aria2 {
 
@@ -68,8 +69,7 @@ void StreamFileAllocationEntry::prepareForNextAction(std::deque<Command*>& comma
     } else {
       Command* command =
 	InitiateConnectionCommandFactory::createInitiateConnectionCommand
-	(CUIDCounterSingletonHolder::instance()->newID(),
-	 _currentRequest, _requestGroup, e);
+	(e->newCUID(), _currentRequest, _requestGroup, e);
 
       commands.push_back(command);