stdc++: migrate nall to std::shared_ptr

Author: rasky

nall/nall/http/message.hpp

@@ -13,7 +13,7 @@ struct Variable {
 };
 
 struct SharedVariable {
-  SharedVariable(const nall::string& name = "", const nall::string& value = "") : shared(new Variable{name, value}) {}
+  SharedVariable(const nall::string& name = "", const nall::string& value = "") : shared(std::make_shared<Variable>(Variable{name, value})) {}
 
   explicit operator bool() const { return (bool)shared->name; }
   auto operator()() const { return shared->value; }
@@ -30,7 +30,7 @@ struct SharedVariable {
   auto& setName(const nall::string& name) { shared->name = name; return *this; }
   auto& setValue(const nall::string& value = "") { shared->value = value; return *this; }
 
-  shared_pointer<Variable> shared;
+  std::shared_ptr<Variable> shared;
 };
 
 struct Variables {

nall/nall/nall.hpp

@@ -47,7 +47,7 @@
 #include <nall/run.hpp>
 #include <nall/serializer.hpp>
 #include <nall/set.hpp>
-#include <nall/shared-pointer.hpp>
+// #include <nall/shared-pointer.hpp>  // migrated to std::shared_ptr
 #include <nall/stdint.hpp>
 #include <nall/string.hpp>
 #include <nall/terminal.hpp>

nall/nall/string.hpp

@@ -16,7 +16,6 @@
 #include <nall/intrinsics.hpp>
 #include <nall/memory.hpp>
 #include <nall/primitives.hpp>
-#include <nall/shared-pointer.hpp>
 #include <nall/stdint.hpp>
 #include <nall/utility.hpp>
 #include <nall/varint.hpp>

nall/nall/string/markup/bml.hpp

@@ -8,7 +8,7 @@ namespace nall::BML {
 //metadata is used to store nesting level
 
 struct ManagedNode;
-using SharedNode = shared_pointer<ManagedNode>;
+using SharedNode = std::shared_ptr<ManagedNode>;
 
 struct ManagedNode : Markup::ManagedNode {
 protected:
@@ -68,7 +68,7 @@ struct ManagedNode : Markup::ManagedNode {
       while(*p == ' ') p++;  //skip excess spaces
       if(*(p + 0) == '/' && *(p + 1) == '/') break;  //skip comments
 
-      SharedNode node(new ManagedNode);
+      SharedNode node = std::make_shared<ManagedNode>();
       u32 length = 0;
       while(valid(p[length])) length++;
       if(length == 0) throw "Invalid attribute name";
@@ -96,7 +96,7 @@ struct ManagedNode : Markup::ManagedNode {
         continue;
       }
 
-      SharedNode node(new ManagedNode);
+      SharedNode node = std::make_shared<ManagedNode>();
       node->parseNode(text, y, spacing);
       _children.push_back(node);
     }
@@ -144,7 +144,7 @@ struct ManagedNode : Markup::ManagedNode {
 };
 
 inline auto unserialize(const string& markup, string_view spacing = {}) -> Markup::Node {
-  SharedNode node(new ManagedNode);
+  SharedNode node = std::make_shared<ManagedNode>();
   try {
     node->parse(markup, spacing);
   } catch(const char* error) {

nall/nall/string/markup/find.hpp

@@ -133,13 +133,13 @@ inline auto ManagedNode::_create(const string& path) -> Node {
         return node->_create(slice(path, *position + 1));
       }
     }
-    _children.push_back(new ManagedNode(name));
+    _children.push_back(std::make_shared<ManagedNode>(name));
     return _children.back()->_create(slice(path, *position + 1));
   }
   for(auto& node : _children) {
     if(path == node->_name) return node;
   }
-  _children.push_back(new ManagedNode(path));
+  _children.push_back(std::make_shared<ManagedNode>(path));
   return _children.back();
 }
 

nall/nall/string/markup/json.hpp

@@ -3,7 +3,7 @@
 namespace nall::JSON {
 
 struct ManagedNode;
-using SharedNode = shared_pointer<ManagedNode>;
+using SharedNode = std::shared_ptr<ManagedNode>;
 
 struct ManagedNode : Markup::ManagedNode {
 protected:
@@ -41,7 +41,7 @@ struct ManagedNode : Markup::ManagedNode {
       return;
     }
     while(true) {
-      SharedNode node(new ManagedNode);
+      SharedNode node = std::make_shared<ManagedNode>();
       node->parseMember(p);
       _children.push_back(node);
       if(*p != ',') break;
@@ -58,7 +58,7 @@ struct ManagedNode : Markup::ManagedNode {
       return;
     }
     for(u32 index = 0;; index++) {
-      SharedNode node(new ManagedNode);
+      SharedNode node = std::make_shared<ManagedNode>();
       node->_name = index;
       node->parseElement(p);
       _children.push_back(node);
@@ -189,7 +189,7 @@ struct ManagedNode : Markup::ManagedNode {
 };
 
 inline auto unserialize(const string& markup) -> Markup::Node {
-  SharedNode node(new ManagedNode);
+  SharedNode node = std::make_shared<ManagedNode>();
   try {
     const char* p = markup;
     node->parseElement(p);

nall/nall/string/markup/node.hpp

@@ -6,7 +6,7 @@ namespace nall::Markup {
 
 struct Node;
 struct ManagedNode;
-using SharedNode = shared_pointer<ManagedNode>;
+using SharedNode = std::shared_ptr<ManagedNode>;
 
 struct ManagedNode {
   ManagedNode() = default;
@@ -46,12 +46,12 @@ struct ManagedNode {
 };
 
 struct Node {
-  Node() : shared(new ManagedNode) {}
-  Node(const SharedNode& source) : shared(source ? source : new ManagedNode) {}
-  Node(const nall::string& name) : shared(new ManagedNode(name)) {}
-  Node(const nall::string& name, const nall::string& value) : shared(new ManagedNode(name, value)) {}
+  Node() : shared(std::make_shared<ManagedNode>()) {}
+  Node(const SharedNode& source) : shared(source ? source : std::make_shared<ManagedNode>()) {}
+  Node(const nall::string& name) : shared(std::make_shared<ManagedNode>(name)) {}
+  Node(const nall::string& name, const nall::string& value) : shared(std::make_shared<ManagedNode>(name, value)) {}
 
-  auto unique() const -> bool { return shared.unique(); }
+  auto unique() const -> bool { return shared.use_count() == 1; }
   auto clone() const -> Node { return shared->clone(); }
   auto copy(Node source) -> void { return shared->copy(source.shared); }
 

nall/nall/string/markup/xml.hpp

@@ -10,7 +10,7 @@ namespace nall::XML {
 //  1 = attribute
 
 struct ManagedNode;
-using SharedNode = shared_pointer<ManagedNode>;
+using SharedNode = std::shared_ptr<ManagedNode>;
 
 struct ManagedNode : Markup::ManagedNode {
 protected:
@@ -205,15 +205,15 @@ struct ManagedNode : Markup::ManagedNode {
 };
 
 inline auto unserialize(const string& markup) -> Markup::Node {
-  SharedNode node(new ManagedNode);
+  SharedNode node = std::make_shared<ManagedNode>();
+  SharedNode node1 = std::make_shared<ManagedNode>();
   try {
-
     const char* p = markup;
-    node->parse(p);
+    node1->parse(p);
   } catch(const char* error) {
-    node.reset();
+    node1.reset();
   }
-  return Markup::SharedNode(node);
+  return Markup::SharedNode(node1);
 }
 
 }

nall/nall/vfs/cdrom.hpp

@@ -87,7 +87,7 @@ struct cdrom : file {
 
 private:
   auto loadCue(const string& cueLocation, const Decode::ZIP* archive, const Decode::ZIP::File* compressedFile) -> bool {
-    auto cuesheet = shared_pointer<Decode::CUE>::create();
+    auto cuesheet = std::make_shared<Decode::CUE>();
     if(!cuesheet->load(cueLocation, archive, compressedFile)) return false;
 
     CD::Session session;
@@ -251,7 +251,7 @@ struct cdrom : file {
   }
 #if defined(ARES_ENABLE_CHD)
   auto loadChd(const string& location) -> bool {
-    auto chd = shared_pointer<Decode::CHD>::create();
+    auto chd = std::make_shared<Decode::CHD>();
     if(!chd->load(location)) return false;
 
     CD::Session session;