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

1 files changed, 12 insertions, 13 deletions

diff --git a/src/MetalinkEntry.h b/src/MetalinkEntry.h
index fa15aaac..475efe0d 100644
--- a/src/MetalinkEntry.h
+++ b/src/MetalinkEntry.h
@@ -39,8 +39,7 @@
 
 #include <string>
 #include <vector>
-
-#include "SharedHandle.h"
+#include <memory>
 
 namespace aria2 {
 
@@ -55,21 +54,21 @@ class Signature;
 
 class MetalinkEntry {
 public:
-  SharedHandle<FileEntry> file;
+  std::shared_ptr<FileEntry> file;
   std::string version;
   std::vector<std::string> languages;
   std::vector<std::string> oses;
   // True if size is specified in Metalink document.
   bool sizeKnown;
-  std::vector<SharedHandle<MetalinkResource> > resources;
-  std::vector<SharedHandle<MetalinkMetaurl> > metaurls;
+  std::vector<std::shared_ptr<MetalinkResource> > resources;
+  std::vector<std::shared_ptr<MetalinkMetaurl> > metaurls;
   int maxConnections; // Metalink3Spec
 #ifdef ENABLE_MESSAGE_DIGEST
-  SharedHandle<Checksum> checksum;
-  SharedHandle<ChunkChecksum> chunkChecksum;
+  std::shared_ptr<Checksum> checksum;
+  std::shared_ptr<ChunkChecksum> chunkChecksum;
 #endif // ENABLE_MESSAGE_DIGEST
 private:
-  SharedHandle<Signature> signature_;
+  std::shared_ptr<Signature> signature_;
 public:
   MetalinkEntry();
 
@@ -81,7 +80,7 @@ public:
 
   int64_t getLength() const;
 
-  const SharedHandle<FileEntry>& getFile() const
+  const std::shared_ptr<FileEntry>& getFile() const
   {
     return file;
   }
@@ -102,12 +101,12 @@ public:
   void setProtocolPriority(const std::string& protocol, int priorityToAdd);
 
   static void toFileEntry
-  (std::vector<SharedHandle<FileEntry> >& fileEntries,
-   const std::vector<SharedHandle<MetalinkEntry> >& metalinkEntries);
+  (std::vector<std::shared_ptr<FileEntry> >& fileEntries,
+   const std::vector<std::shared_ptr<MetalinkEntry> >& metalinkEntries);
 
-  void setSignature(const SharedHandle<Signature>& signature);
+  void setSignature(const std::shared_ptr<Signature>& signature);
 
-  const SharedHandle<Signature>& getSignature() const
+  const std::shared_ptr<Signature>& getSignature() const
   {
     return signature_;
   }