From 0e25f364f84aa96f911c335cf1a8f82d4d3cc671 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 30 May 2023 21:53:32 +0200 Subject: [PATCH] Fix build issues MSVC 17.6.2 --- .../ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp | 4 ++-- .../Completions/RigTransmissibilityCondenser.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp index 411abcf05c..ca766fbd66 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp @@ -158,7 +158,7 @@ RimWellLogExtractionCurve::~RimWellLogExtractionCurve() void RimWellLogExtractionCurve::setWellPath( RimWellPath* wellPath ) { m_wellPath = wellPath; - if ( m_wellPath == m_refWellPath ) m_refWellPath = nullptr; + if ( m_wellPath() == m_refWellPath() ) m_refWellPath = nullptr; } //-------------------------------------------------------------------------------------------------- @@ -306,7 +306,7 @@ void RimWellLogExtractionCurve::fieldChangedByUi( const caf::PdmFieldHandle* cha } else if ( changedField == &m_wellPath ) { - if ( m_wellPath == m_refWellPath ) m_refWellPath = nullptr; + if ( m_wellPath() == m_refWellPath() ) m_refWellPath = nullptr; this->loadDataAndUpdate( true ); } else if ( ( changedField == &m_refWellPath ) || ( changedField == &m_timeStep ) || ( changedField == &m_trajectoryType ) || diff --git a/ApplicationLibCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp b/ApplicationLibCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp index 6267a12cc1..ba2ba05acf 100644 --- a/ApplicationLibCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp +++ b/ApplicationLibCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp @@ -118,8 +118,6 @@ std::set RigTransmissibilityCondenser //-------------------------------------------------------------------------------------------------- double RigTransmissibilityCondenser::condensedTransmissibility( CellAddress externalCell1, CellAddress externalCell2 ) { - CAF_ASSERT( !( externalCell1 == externalCell2 ) ); - if ( m_condensedTransmissibilities.empty() ) { calculateCondensedTransmissibilities();