External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement move - copy constructor seems to be broken!

Browse Source
This commit is contained in:
Hannes Janetzek 2016-06-21 14:33:30 +02:00
parent 7c84064905
commit 7c7bf899b7
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/yaml-cpp/node/impl.h
View File

@ -42,6 +42,16 @@ inline Node::Node(const Node& rhs)
m_pMemory(rhs.m_pMemory), m_pMemory(rhs.m_pMemory),
m_pNode(rhs.m_pNode) {} m_pNode(rhs.m_pNode) {}
inline Node::Node(Node&& rhs)
: m_isValid(rhs.m_isValid),
m_pMemory(rhs.m_pMemory),
m_pNode(rhs.m_pNode) {
rhs.m_pMemory.reset(new detail::memory_holder);
rhs.m_pNode = &rhs.m_pMemory->create_node();
rhs.m_pNode->set_null();
}
inline Node::Node(Zombie) : m_isValid(false), m_pNode(NULL) {} inline Node::Node(Zombie) : m_isValid(false), m_pNode(NULL) {}
inline Node::Node(detail::node& node, detail::shared_memory_holder pMemory) inline Node::Node(detail::node& node, detail::shared_memory_holder pMemory)
@ -247,6 +257,20 @@ inline Node& Node::operator=(const Node& rhs) {
return *this; return *this;
} }
inline Node& Node::operator=(Node&& rhs) {
if (!m_isValid || !rhs.m_isValid)
throw InvalidNode();
if (is(rhs))
return *this;
AssignNode(rhs);
rhs.m_pMemory.reset(new detail::memory_holder);
rhs.m_pNode = &rhs.m_pMemory->create_node();
rhs.m_pNode->set_null();
return *this;
}
inline void Node::AssignData(const Node& rhs) { inline void Node::AssignData(const Node& rhs) {
if (!m_isValid || !rhs.m_isValid) if (!m_isValid || !rhs.m_isValid)
throw InvalidNode(); throw InvalidNode();

3
include/yaml-cpp/node/node.h
View File

@ -47,6 +47,8 @@ class YAML_CPP_API Node {
explicit Node(const T& rhs); explicit Node(const T& rhs);
explicit Node(const detail::iterator_value& rhs); explicit Node(const detail::iterator_value& rhs);
Node(const Node& rhs); Node(const Node& rhs);
Node(Node&& rhs);
~Node(); ~Node();
YAML::Mark Mark() const; YAML::Mark Mark() const;
@ -81,6 +83,7 @@ class YAML_CPP_API Node {
template <typename T> template <typename T>
Node& operator=(const T& rhs); Node& operator=(const T& rhs);
Node& operator=(const Node& rhs); Node& operator=(const Node& rhs);
Node& operator=(Node&& rhs);
void reset(const Node& rhs = Node()); void reset(const Node& rhs = Node());
// size/iterator // size/iterator