peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 12:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switched Node::operator=(const Node&) to *not* force itself to create its node first (since we're just assigning them)

Browse Source
This commit is contained in:
Jesse Beder
2011-09-12 22:05:43 -05:00
parent 0c321a6dc6
commit a8f82af604
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,9 +138,14 @@ namespace YAML
inline void Node::AssignNode(const Node& rhs) inline void Node::AssignNode(const Node& rhs)
{ {
EnsureNodeExists();
rhs.EnsureNodeExists(); rhs.EnsureNodeExists();
if(!m_pNode) {
m_pNode = rhs.m_pNode;
m_pMemory = rhs.m_pMemory;
return;
}
m_pNode->set_ref(*rhs.m_pNode); m_pNode->set_ref(*rhs.m_pNode);
m_pMemory->merge(*rhs.m_pMemory); m_pMemory->merge(*rhs.m_pMemory);
m_pNode = rhs.m_pNode; m_pNode = rhs.m_pNode;