From eef3d7f5f36617a741e1a7c172bf897f9d81dd95 Mon Sep 17 00:00:00 2001 From: Vyacheslav Napadovsky Date: Tue, 15 Apr 2025 16:48:26 +0900 Subject: [PATCH] replace std::shared_ptr(new T) with std::make_shared --- include/yaml-cpp/node/detail/memory.h | 2 +- include/yaml-cpp/node/detail/node.h | 2 +- include/yaml-cpp/node/detail/node_ref.h | 2 +- include/yaml-cpp/node/impl.h | 4 ++-- src/memory.cpp | 2 +- src/nodebuilder.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/yaml-cpp/node/detail/memory.h b/include/yaml-cpp/node/detail/memory.h index e881545bf..ea0937355 100644 --- a/include/yaml-cpp/node/detail/memory.h +++ b/include/yaml-cpp/node/detail/memory.h @@ -33,7 +33,7 @@ class YAML_CPP_API memory { class YAML_CPP_API memory_holder { public: - memory_holder() : m_pMemory(new memory) {} + memory_holder() : m_pMemory(std::make_shared()) {} node& create_node() { return m_pMemory->create_node(); } void merge(memory_holder& rhs); diff --git a/include/yaml-cpp/node/detail/node.h b/include/yaml-cpp/node/detail/node.h index acf60ffb6..00fae2431 100644 --- a/include/yaml-cpp/node/detail/node.h +++ b/include/yaml-cpp/node/detail/node.h @@ -24,7 +24,7 @@ class node { }; public: - node() : m_pRef(new node_ref), m_dependencies{}, m_index{} {} + node() : m_pRef(std::make_shared()), m_dependencies{}, m_index{} {} node(const node&) = delete; node& operator=(const node&) = delete; diff --git a/include/yaml-cpp/node/detail/node_ref.h b/include/yaml-cpp/node/detail/node_ref.h index d8a94f8b8..a3c6ace9e 100644 --- a/include/yaml-cpp/node/detail/node_ref.h +++ b/include/yaml-cpp/node/detail/node_ref.h @@ -16,7 +16,7 @@ namespace YAML { namespace detail { class node_ref { public: - node_ref() : m_pData(new node_data) {} + node_ref() : m_pData(std::make_shared()) {} node_ref(const node_ref&) = delete; node_ref& operator=(const node_ref&) = delete; diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h index f5d622b25..48d440d23 100644 --- a/include/yaml-cpp/node/impl.h +++ b/include/yaml-cpp/node/impl.h @@ -22,7 +22,7 @@ inline Node::Node() inline Node::Node(NodeType::value type) : m_isValid(true), m_invalidKey{}, - m_pMemory(new detail::memory_holder), + m_pMemory(std::make_shared()), m_pNode(&m_pMemory->create_node()) { m_pNode->set_type(type); } @@ -31,7 +31,7 @@ template inline Node::Node(const T& rhs) : m_isValid(true), m_invalidKey{}, - m_pMemory(new detail::memory_holder), + m_pMemory(std::make_shared()), m_pNode(&m_pMemory->create_node()) { Assign(rhs); } diff --git a/src/memory.cpp b/src/memory.cpp index 676e4c7f1..c3d69ed44 100644 --- a/src/memory.cpp +++ b/src/memory.cpp @@ -14,7 +14,7 @@ void memory_holder::merge(memory_holder& rhs) { } node& memory::create_node() { - shared_node pNode(new node); + shared_node pNode(std::make_shared()); m_nodes.insert(pNode); return *pNode; } diff --git a/src/nodebuilder.cpp b/src/nodebuilder.cpp index bbaefac8a..ba7368d56 100644 --- a/src/nodebuilder.cpp +++ b/src/nodebuilder.cpp @@ -10,7 +10,7 @@ namespace YAML { struct Mark; NodeBuilder::NodeBuilder() - : m_pMemory(new detail::memory_holder), + : m_pMemory(std::make_shared()), m_pRoot(nullptr), m_stack{}, m_anchors{},