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

System : Replace NULL with nullptr

Browse Source
This commit is contained in:
Magne Sjaastad
2018-10-10 10:17:07 +02:00
parent c0d8fe37e1
commit 9d9771295f
20 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ReservoirDataModel/RigResultModifier.h
View File

@@ -80,7 +80,7 @@ public:
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex);
CVF_TIGHT_ASSERT(m_reservoirResultValues != NULL && resultValueIndex < m_reservoirResultValues->size());
CVF_TIGHT_ASSERT(m_reservoirResultValues != nullptr && resultValueIndex < m_reservoirResultValues->size());
(*m_reservoirResultValues)[resultValueIndex] = scalarValue;
}

2
ApplicationCode/ReservoirDataModel/RigTernaryResultAccessor2d.cpp
View File

@@ -32,7 +32,7 @@ RigTernaryResultAccessor::RigTernaryResultAccessor()
}
//--------------------------------------------------------------------------------------------------
/// Requires at least two data objects present, asserts if more than one data accessor is NULL
/// Requires at least two data objects present, asserts if more than one data accessor is nullptr
//--------------------------------------------------------------------------------------------------
void RigTernaryResultAccessor::setTernaryResultAccessors(RigResultAccessor* soil, RigResultAccessor* sgas, RigResultAccessor* swat)
{

4
ApplicationCode/ReservoirDataModel/cvfGeometryTools.cpp
View File

@@ -428,8 +428,8 @@ int GeometryTools::intersectLineSegmentTriangle( const cvf::Vec3d p0, const cvf:
const cvf::Vec3d t0, const cvf::Vec3d t1, const cvf::Vec3d t2,
cvf::Vec3d* intersectionPoint , bool * isLineDirDotNormalNegative)
{
CVF_TIGHT_ASSERT(intersectionPoint != NULL);
CVF_TIGHT_ASSERT(isLineDirDotNormalNegative != NULL);
CVF_TIGHT_ASSERT(intersectionPoint != nullptr);
CVF_TIGHT_ASSERT(isLineDirDotNormalNegative != nullptr);
cvf::Vec3d u, v, n; // triangle vectors
cvf::Vec3d dir, w0, w; // ray vectors