OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Intermediate fix for fields with multiple parents. Asserts must be reintroduced later.

Browse Source
This commit is contained in:
Magne Sjaastad 2015-08-04 14:32:18 +02:00
parent 05ebf92e62
commit 392876dcaa
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.cpp
View File

@ -42,8 +42,10 @@ void PdmObjectHandle::fields(std::vector<PdmFieldHandle*>& fields) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmObjectHandle::setAsParentField(PdmFieldHandle* parentField) void PdmObjectHandle::setAsParentField(PdmFieldHandle* parentField)
{ {
assert(m_parentField == NULL); // MODTODO This asserts must be reintroduced when ptrfield is implemented
m_parentField = parentField; // assert(m_parentField == NULL);
m_parentField = parentField;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -51,8 +53,10 @@ void PdmObjectHandle::setAsParentField(PdmFieldHandle* parentField)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmObjectHandle::removeAsParentField(PdmFieldHandle* parentField) void PdmObjectHandle::removeAsParentField(PdmFieldHandle* parentField)
{ {
assert(m_parentField == parentField); // MODTODO This asserts must be reintroduced when ptrfield is implemented
m_parentField = NULL; // assert(m_parentField == parentField);
m_parentField = NULL;
} }