From 07d270c87e6f9184aea4ca17eb26e466712e8db2 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 22 Jun 2013 01:10:38 +0900
Subject: Require -std=c++11 and use std::shared_ptr instead of SharedHandle

---
 src/ValueBaseStructParserStateMachine.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/ValueBaseStructParserStateMachine.h')

diff --git a/src/ValueBaseStructParserStateMachine.h b/src/ValueBaseStructParserStateMachine.h
index 5b5efa56..a0f0e6a5 100644
--- a/src/ValueBaseStructParserStateMachine.h
+++ b/src/ValueBaseStructParserStateMachine.h
@@ -39,8 +39,7 @@
 
 #include <string>
 #include <stack>
-
-#include "SharedHandle.h"
+#include <memory>
 
 namespace aria2 {
 
@@ -56,8 +55,8 @@ class ValueBaseStructParserState;
 // value holder.
 class ValueBaseStructParserStateMachine : public StructParserStateMachine {
 public:
-  typedef SharedHandle<ValueBase> ResultType;
-  static const SharedHandle<ValueBase>& noResult();
+  typedef std::shared_ptr<ValueBase> ResultType;
+  static const std::shared_ptr<ValueBase>& noResult();
 
   struct NumberData {
     int64_t number;
@@ -81,7 +80,7 @@ public:
   virtual void numberCallback(int64_t number, int frac, int exp);
   virtual void boolCallback(bool bval);
 
-  SharedHandle<ValueBase> getResult() const;
+  std::shared_ptr<ValueBase> getResult() const;
 
   virtual void reset();
 
@@ -92,8 +91,8 @@ public:
   void popArrayFrame();
   void popDictFrame();
   void pushFrame();
-  void setCurrentFrameValue(const SharedHandle<ValueBase>& value);
-  const SharedHandle<ValueBase>& getCurrentFrameValue() const;
+  void setCurrentFrameValue(const std::shared_ptr<ValueBase>& value);
+  const std::shared_ptr<ValueBase>& getCurrentFrameValue() const;
   void setCurrentFrameName(const std::string& name);
 
   void pushDictState();
-- 
cgit