diff options
author | Richard Linden <none@none> | 2012-07-24 12:03:00 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-07-24 12:03:00 -0700 |
commit | 0a28a63ce05755d22b09badc41bdd23d5baab1bb (patch) | |
tree | b2c534db33f5d1a60ce32173404194520120ac00 | |
parent | 310ebe90a9250976700a594f4027d8423a342e64 (diff) |
fix for gcc builds
-rw-r--r-- | indra/llxml/llxmlnode.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index 45839595a0..afb0d87da9 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -147,13 +147,15 @@ LLXMLNodePtr LLXMLNode::deepCopy() for (LLXMLChildList::iterator iter = mChildren->map.begin(); iter != mChildren->map.end(); ++iter) { - newnode->addChild(iter->second->deepCopy()); + LLXMLNodePtr temp_ptr_for_gcc(iter->second->deepCopy()); + newnode->addChild(temp_ptr_for_gcc); } } for (LLXMLAttribList::iterator iter = mAttributes.begin(); iter != mAttributes.end(); ++iter) { - newnode->addChild(iter->second->deepCopy()); + LLXMLNodePtr temp_ptr_for_gcc(iter->second->deepCopy()); + newnode->addChild(temp_ptr_for_gcc); } return newnode; @@ -1146,7 +1148,8 @@ void LLXMLNode::scrubToTree(LLXMLNode *tree) std::vector<LLXMLNodePtr>::iterator itor3; for (itor3=to_delete_list.begin(); itor3!=to_delete_list.end(); ++itor3) { - (*itor3)->setParent(LLXMLNodePtr()); + LLXMLNodePtr ptr; + (*itor3)->setParent(ptr); } } } |