Commit f4409b3d authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov

оператор присваивания теперь побеждает конструктор.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@60076 954022d7-b5bf-4e40-9824-e11837661b57
parent 7d170982
...@@ -111,11 +111,11 @@ namespace NSCommon ...@@ -111,11 +111,11 @@ namespace NSCommon
this->m_pPointer = NULL; this->m_pPointer = NULL;
} }
*/ */
nullable<Type>& operator=(XmlUtils::CXmlNode& oNode) nullable<Type>& operator=(const XmlUtils::CXmlNode& oNode)
{ {
RELEASEOBJECT(this->m_pPointer); RELEASEOBJECT(this->m_pPointer);
if (oNode.IsValid()) if (oNode.IsValid())
this->m_pPointer = new Type(oNode); this->m_pPointer = new Type(const_cast<XmlUtils::CXmlNode&> (oNode));
return *this; return *this;
} }
#ifdef _USE_XMLLITE_READER_ #ifdef _USE_XMLLITE_READER_
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment