From bfb732c5d47678f155bbec319bac94068b679b69 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 23 Jun 2013 12:02:36 +0900
Subject: [PATCH] DefaultBtRequestFactory: Use raw pointer for pieceStorage_

---
 src/DefaultBtRequestFactory.cc      | 10 +++++-----
 src/DefaultBtRequestFactory.h       |  4 ++--
 src/PeerInteractionCommand.cc       |  2 +-
 test/DefaultBtRequestFactoryTest.cc |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/DefaultBtRequestFactory.cc b/src/DefaultBtRequestFactory.cc
index eb797ad2..121f0f32 100644
--- a/src/DefaultBtRequestFactory.cc
+++ b/src/DefaultBtRequestFactory.cc
@@ -52,7 +52,8 @@
 namespace aria2 {
 
 DefaultBtRequestFactory::DefaultBtRequestFactory()
-  : dispatcher_(0),
+  : pieceStorage_(0),
+    dispatcher_(0),
     messageFactory_(0),
     cuid_(0)
 {}
@@ -104,11 +105,11 @@ namespace {
 class ProcessChokedPiece {
 private:
   std::shared_ptr<Peer> peer_;
-  std::shared_ptr<PieceStorage> pieceStorage_;
+  PieceStorage* pieceStorage_;
   cuid_t cuid_;
 public:
   ProcessChokedPiece(const std::shared_ptr<Peer>& peer,
-                     const std::shared_ptr<PieceStorage>& pieceStorage,
+                     PieceStorage* pieceStorage,
                      cuid_t cuid):
     peer_(peer),
     pieceStorage_(pieceStorage),
@@ -262,8 +263,7 @@ void DefaultBtRequestFactory::getTargetPieceIndexes
                  std::mem_fn(&Piece::getIndex));
 }
 
-void DefaultBtRequestFactory::setPieceStorage
-(const std::shared_ptr<PieceStorage>& pieceStorage)
+void DefaultBtRequestFactory::setPieceStorage(PieceStorage* pieceStorage)
 {
   pieceStorage_ = pieceStorage;
 }
diff --git a/src/DefaultBtRequestFactory.h b/src/DefaultBtRequestFactory.h
index d845da70..0ae52e3a 100644
--- a/src/DefaultBtRequestFactory.h
+++ b/src/DefaultBtRequestFactory.h
@@ -51,7 +51,7 @@ class Piece;
 
 class DefaultBtRequestFactory : public BtRequestFactory {
 private:
-  std::shared_ptr<PieceStorage> pieceStorage_;
+  PieceStorage* pieceStorage_;
   std::shared_ptr<Peer> peer_;
   BtMessageDispatcher* dispatcher_;
   BtMessageFactory* messageFactory_;
@@ -91,7 +91,7 @@ public:
     return pieces_;
   }
 
-  void setPieceStorage(const std::shared_ptr<PieceStorage>& pieceStorage);
+  void setPieceStorage(PieceStorage* pieceStorage);
 
   void setPeer(const std::shared_ptr<Peer>& peer);
 
diff --git a/src/PeerInteractionCommand.cc b/src/PeerInteractionCommand.cc
index 35b18328..b89d5c53 100644
--- a/src/PeerInteractionCommand.cc
+++ b/src/PeerInteractionCommand.cc
@@ -212,7 +212,7 @@ PeerInteractionCommand::PeerInteractionCommand
 
   DefaultBtRequestFactory* reqFactoryPtr(new DefaultBtRequestFactory());
   reqFactoryPtr->setPeer(getPeer());
-  reqFactoryPtr->setPieceStorage(pieceStorage);
+  reqFactoryPtr->setPieceStorage(pieceStorage.get());
   reqFactoryPtr->setBtMessageDispatcher(dispatcherPtr);
   reqFactoryPtr->setBtMessageFactory(factoryPtr);
   reqFactoryPtr->setCuid(cuid);
diff --git a/test/DefaultBtRequestFactoryTest.cc b/test/DefaultBtRequestFactoryTest.cc
index 3b17982d..cfc4e4b3 100644
--- a/test/DefaultBtRequestFactoryTest.cc
+++ b/test/DefaultBtRequestFactoryTest.cc
@@ -97,7 +97,7 @@ public:
     dispatcher_.reset(new MockBtMessageDispatcher());
 
     requestFactory_.reset(new DefaultBtRequestFactory());
-    requestFactory_->setPieceStorage(pieceStorage_);
+    requestFactory_->setPieceStorage(pieceStorage_.get());
     requestFactory_->setPeer(peer_);
     requestFactory_->setBtMessageDispatcher(dispatcher_.get());
     requestFactory_->setBtMessageFactory(messageFactory_.get());