Commit ef54feb0 authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov

added const modifier to nullable(const XmlUtils::CXmlNode& oNode)

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58925 954022d7-b5bf-4e40-9824-e11837661b57
parent c7fcbd2c
......@@ -95,13 +95,14 @@ namespace NSCommon
else
this->m_pPointer = new Type( (const Type&)*(oOther.m_pPointer) );
}
//nullable(const XmlUtils::CXmlNode& oNode)
//{
// if (oNode.IsValid())
// this->m_pPointer = new Type(oNode);
// else
// this->m_pPointer = NULL;
//}
nullable(const XmlUtils::CXmlNode& oNode) // const modifier is important for gcc compiler in our case
{
if (oNode.IsValid())
this->m_pPointer = new Type(const_cast<XmlUtils::CXmlNode&> (oNode));
else
this->m_pPointer = NULL;
}
/*
nullable(XmlUtils::CXmlNode& oNode)
{
if (oNode.IsValid())
......@@ -109,6 +110,7 @@ namespace NSCommon
else
this->m_pPointer = NULL;
}
*/
nullable<Type>& operator=(XmlUtils::CXmlNode& oNode)
{
RELEASEOBJECT(this->m_pPointer);
......
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