Require -std=c++11 and use std::shared_ptr instead of SharedHandle

1 files changed, 30 insertions, 30 deletions

diff --git a/src/DHTMessageFactoryImpl.h b/src/DHTMessageFactoryImpl.h
index 87738b44..cafdcbd3 100644
--- a/src/DHTMessageFactoryImpl.h
+++ b/src/DHTMessageFactoryImpl.h
@@ -52,7 +52,7 @@ class DHTMessageFactoryImpl:public DHTMessageFactory {
 private:
   int family_;
 
-  SharedHandle<DHTNode> localNode_;
+  std::shared_ptr<DHTNode> localNode_;
 
   DHTConnection* connection_;
 
@@ -65,7 +65,7 @@ private:
   DHTTokenTracker* tokenTracker_;
 
   // search node in routingTable. If it is not found, create new one.
-  SharedHandle<DHTNode> getRemoteNode
+  std::shared_ptr<DHTNode> getRemoteNode
   (const unsigned char* id, const std::string& ipaddr, uint16_t port) const;
 
   void validateID(const String* id) const;
@@ -73,7 +73,7 @@ private:
   void validatePort(const Integer* i) const;
 
   void extractNodes
-  (std::vector<SharedHandle<DHTNode> >& nodes,
+  (std::vector<std::shared_ptr<DHTNode> >& nodes,
    const unsigned char* src, size_t length);
 
   void setCommonProperty(DHTAbstractMessage* m);
@@ -83,72 +83,72 @@ public:
 
   virtual ~DHTMessageFactoryImpl();
 
-  virtual SharedHandle<DHTQueryMessage>
+  virtual std::shared_ptr<DHTQueryMessage>
   createQueryMessage(const Dict* dict,
                      const std::string& ipaddr, uint16_t port);
 
-  virtual SharedHandle<DHTResponseMessage>
+  virtual std::shared_ptr<DHTResponseMessage>
   createResponseMessage(const std::string& messageType,
                         const Dict* dict,
                         const std::string& ipaddr, uint16_t port);
 
-  virtual SharedHandle<DHTQueryMessage>
-  createPingMessage(const SharedHandle<DHTNode>& remoteNode,
+  virtual std::shared_ptr<DHTQueryMessage>
+  createPingMessage(const std::shared_ptr<DHTNode>& remoteNode,
                     const std::string& transactionID = A2STR::NIL);
 
-  virtual SharedHandle<DHTResponseMessage>
-  createPingReplyMessage(const SharedHandle<DHTNode>& remoteNode,
+  virtual std::shared_ptr<DHTResponseMessage>
+  createPingReplyMessage(const std::shared_ptr<DHTNode>& remoteNode,
                          const unsigned char* id,
                          const std::string& transactionID);
 
-  virtual SharedHandle<DHTQueryMessage>
-  createFindNodeMessage(const SharedHandle<DHTNode>& remoteNode,
+  virtual std::shared_ptr<DHTQueryMessage>
+  createFindNodeMessage(const std::shared_ptr<DHTNode>& remoteNode,
                         const unsigned char* targetNodeID,
                         const std::string& transactionID = A2STR::NIL);
 
-  SharedHandle<DHTResponseMessage>
-  createFindNodeReplyMessage(const SharedHandle<DHTNode>& remoteNode,
+  std::shared_ptr<DHTResponseMessage>
+  createFindNodeReplyMessage(const std::shared_ptr<DHTNode>& remoteNode,
                              const Dict* dict,
                              const std::string& transactionID);
 
 
-  virtual SharedHandle<DHTResponseMessage>
+  virtual std::shared_ptr<DHTResponseMessage>
   createFindNodeReplyMessage
-  (const SharedHandle<DHTNode>& remoteNode,
-   const std::vector<SharedHandle<DHTNode> >& closestKNodes,
+  (const std::shared_ptr<DHTNode>& remoteNode,
+   const std::vector<std::shared_ptr<DHTNode> >& closestKNodes,
    const std::string& transactionID);
 
-  virtual SharedHandle<DHTQueryMessage>
-  createGetPeersMessage(const SharedHandle<DHTNode>& remoteNode,
+  virtual std::shared_ptr<DHTQueryMessage>
+  createGetPeersMessage(const std::shared_ptr<DHTNode>& remoteNode,
                         const unsigned char* infoHash,
                         const std::string& transactionID = A2STR::NIL);
 
-  virtual SharedHandle<DHTResponseMessage>
+  virtual std::shared_ptr<DHTResponseMessage>
   createGetPeersReplyMessage
-  (const SharedHandle<DHTNode>& remoteNode,
-   const std::vector<SharedHandle<DHTNode> >& closestKNodes,
-   const std::vector<SharedHandle<Peer> >& peers,
+  (const std::shared_ptr<DHTNode>& remoteNode,
+   const std::vector<std::shared_ptr<DHTNode> >& closestKNodes,
+   const std::vector<std::shared_ptr<Peer> >& peers,
    const std::string& token,
    const std::string& transactionID);
 
-  SharedHandle<DHTResponseMessage>
+  std::shared_ptr<DHTResponseMessage>
   createGetPeersReplyMessage
-  (const SharedHandle<DHTNode>& remoteNode,
+  (const std::shared_ptr<DHTNode>& remoteNode,
    const Dict* dict,
    const std::string& transactionID);
 
-  virtual SharedHandle<DHTQueryMessage>
-  createAnnouncePeerMessage(const SharedHandle<DHTNode>& remoteNode,
+  virtual std::shared_ptr<DHTQueryMessage>
+  createAnnouncePeerMessage(const std::shared_ptr<DHTNode>& remoteNode,
                             const unsigned char* infoHash,
                             uint16_t tcpPort,
                             const std::string& token,
                             const std::string& transactionID = A2STR::NIL);
 
-  virtual SharedHandle<DHTResponseMessage>
-  createAnnouncePeerReplyMessage(const SharedHandle<DHTNode>& remoteNode,
+  virtual std::shared_ptr<DHTResponseMessage>
+  createAnnouncePeerReplyMessage(const std::shared_ptr<DHTNode>& remoteNode,
                                  const std::string& transactionID);
 
-  virtual SharedHandle<DHTMessage>
+  virtual std::shared_ptr<DHTMessage>
   createUnknownMessage(const unsigned char* data, size_t length,
                        const std::string& ipaddr, uint16_t port);
 
@@ -162,7 +162,7 @@ public:
 
   void setTokenTracker(DHTTokenTracker* tokenTracker);
 
-  void setLocalNode(const SharedHandle<DHTNode>& localNode);
+  void setLocalNode(const std::shared_ptr<DHTNode>& localNode);
 };
 
 } // namespace aria2