From 41121e09f7cf6ed4a95797a80da63bca1d4884cd Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 12 Jul 2013 22:59:49 +0900
Subject: Use std::unique_ptr for Metalink objects

---
 src/MetalinkParserStateMachine.cc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/MetalinkParserStateMachine.cc')

diff --git a/src/MetalinkParserStateMachine.cc b/src/MetalinkParserStateMachine.cc
index bcca4410..2f4fd242 100644
--- a/src/MetalinkParserStateMachine.cc
+++ b/src/MetalinkParserStateMachine.cc
@@ -42,6 +42,7 @@
 #include "MetalinkParserStateV4Impl.h"
 #include "Metalinker.h"
 #include "MetalinkEntry.h"
+#include "a2functional.h"
 
 namespace aria2 {
 
@@ -104,8 +105,8 @@ MetalinkParserState* MetalinkParserStateMachine::urlStateV4_ =
 MetalinkParserState* MetalinkParserStateMachine::metaurlStateV4_ =
   new MetaurlMetalinkParserStateV4();
 
-MetalinkParserStateMachine::MetalinkParserStateMachine():
-  ctrl_(new MetalinkParserController())
+MetalinkParserStateMachine::MetalinkParserStateMachine()
+  : ctrl_{make_unique<MetalinkParserController>()}
 {
   stateStack_.push(initialState_);
 }
@@ -551,6 +552,11 @@ std::string MetalinkParserStateMachine::getErrorString() const
   return error.str();
 }
 
+std::unique_ptr<Metalinker> MetalinkParserStateMachine::getResult()
+{
+  return ctrl_->getResult();
+}
+
 void MetalinkParserStateMachine::setBaseUri(const std::string& uri)
 {
   ctrl_->setBaseUri(uri);
-- 
cgit