Skip to content

Commit a7b1d40

Browse files
committed
msvc fix warning about assigment in condition
1 parent fcf5f30 commit a7b1d40

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

  • Sofa/framework/Simulation/Common/src/sofa/simulation/common/xml

Sofa/framework/Simulation/Common/src/sofa/simulation/common/xml/NodeElement.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,15 @@ bool NodeElement::initNode()
5353
if (obj != nullptr)
5454
{
5555
setObject(obj);
56-
core::objectmodel::BaseNode* baseNode;
57-
if (getTypedObject()!=nullptr && getParentElement()!=nullptr && (baseNode = getParentElement()->getObject()->toBaseNode()))
56+
if (getTypedObject() != nullptr && getParentElement() != nullptr)
5857
{
59-
getTypedObject()->setInstanciationSourceFilePos(getSrcLine());
60-
getTypedObject()->setInstanciationSourceFileName(getSrcFile());
61-
baseNode->addChild(getTypedObject());
58+
core::objectmodel::BaseNode* baseNode = getParentElement()->getObject()->toBaseNode();
59+
if (baseNode != nullptr)
60+
{
61+
getTypedObject()->setInstanciationSourceFilePos(getSrcLine());
62+
getTypedObject()->setInstanciationSourceFileName(getSrcFile());
63+
baseNode->addChild(getTypedObject());
64+
}
6265
}
6366
return true;
6467
}

0 commit comments

Comments
 (0)