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

Use raw pointer instead of smart pointer

Browse Source 
p4#: 20892
This commit is contained in:
Magne Sjaastad 2013-03-13 14:58:36 +01:00
parent 160456106a
commit 422c4ca54b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@ -72,12 +72,12 @@ void RimIdenticalGridCaseGroup::addCase(RimReservoir* reservoir)
RigMainGrid* incomingMainGrid = reservoir->reservoirData()->mainGrid(); RigMainGrid* incomingMainGrid = reservoir->reservoirData()->mainGrid();
if (m_mainGrid.isNull()) if (!m_mainGrid)
{ {
m_mainGrid = incomingMainGrid; m_mainGrid = incomingMainGrid;
} }
CVF_ASSERT(m_mainGrid.p() == incomingMainGrid); CVF_ASSERT(m_mainGrid == incomingMainGrid);
caseCollection()->reservoirs().push_back(reservoir); caseCollection()->reservoirs().push_back(reservoir);
@ -92,7 +92,7 @@ void RimIdenticalGridCaseGroup::addCase(RimReservoir* reservoir)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigMainGrid* RimIdenticalGridCaseGroup::mainGrid() RigMainGrid* RimIdenticalGridCaseGroup::mainGrid()
{ {
if (m_mainGrid.notNull()) return m_mainGrid.p(); if (m_mainGrid) return m_mainGrid;
return NULL; return NULL;
} }

3
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h
View File

@ -55,6 +55,5 @@ protected:
virtual caf::PdmFieldHandle* userDescriptionField(); virtual caf::PdmFieldHandle* userDescriptionField();
private: private:
cvf::ref<RigMainGrid> m_mainGrid; RigMainGrid* m_mainGrid;
}; };