OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 14:40:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

#14476 ApplicationLibCode: Replace CVF_ASSERT with CAF_ASSERT

Browse Source 
Migrate all assert macros in ApplicationLibCode to CAF_ASSERT and remove every
use of cvfAssert.h.

CVF_ASSERT is replaced one to one. CVF_TIGHT_ASSERT is also replaced by
CAF_ASSERT, which is semantically exact: CVF_ENABLE_TIGHT_ASSERTS is 1 only
under _DEBUG, and that is what CAF_ASSERT now does. The two CVF_FAIL_MSG sites
become CAF_ASSERT( false && "message" ), preserving the message with the idiom
already used elsewhere in the code base.

Counts before and after: CVF_ASSERT 1044 to 0, CVF_TIGHT_ASSERT 66 to 0,
CVF_FAIL_MSG 2 to 0, cvfAssert.h references 154 to 0.

Include handling: files that included cvfAssert.h directly now include
cafAssert.h instead, includes left dead by the migration are removed, and files
that were relying on cvfAssert.h transitively get an explicit cafAssert.h. Files
that reach cafAssert.h through another caf header are left unchanged; a missing
include here is a compile error, not a silently disabled assert.

ResultStatisticsCache links only LibCore and therefore had no path to
cafAssert.h. Add the cafPdmCore directory as a private include path rather than
linking the library, since cafAssert.h is header only.

Note that this stops these asserts from firing in Release and RelWithDebInfo,
where CVF_ASSERT was previously active.
This commit is contained in:
Magne Sjaastad committed 2026-08-07 15:05:57 +02:00
1 parent d0e9f45f32
commit 56e98ba1c4
475 files changed
+1524 -1307
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ QList<caf::PdmOptionItemInfo> RimGridStatisticsHistogramDataSource::calculateVal
options.push_back( caf::PdmOptionItemInfo( "Disabled", nullptr ) );
for ( RimEclipseView* view : eclipseCase->reservoirViews() )
{
CVF_ASSERT( view && "Really always should have a valid view pointer in ReservoirViews" );
CAF_ASSERT( view && "Really always should have a valid view pointer in ReservoirViews" );
options.push_back( caf::PdmOptionItemInfo( view->name(), view, false, view->uiIconProvider() ) );
}
}
ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramMultiPlot.cpp
+4 -4
View File
@@ -73,7 +73,7 @@ RimHistogramMultiPlot::~RimHistogramMultiPlot()
void RimHistogramMultiPlot::addPlot( RimPlot* plot )
{
auto* sumPlot = dynamic_cast<RimHistogramPlot*>( plot );
CVF_ASSERT( sumPlot != nullptr );
CAF_ASSERT( sumPlot != nullptr );
if ( sumPlot )
{
RimMultiPlot::addPlot( plot );
@@ -86,7 +86,7 @@ void RimHistogramMultiPlot::addPlot( RimPlot* plot )
void RimHistogramMultiPlot::insertPlot( RimPlot* plot, size_t index )
{
auto* sumPlot = dynamic_cast<RimHistogramPlot*>( plot );
CVF_ASSERT( sumPlot != nullptr );
CAF_ASSERT( sumPlot != nullptr );
if ( sumPlot )
{
sumPlot->axisChanged.connect( this, &RimHistogramMultiPlot::onSubPlotAxisChanged );
@@ -104,7 +104,7 @@ void RimHistogramMultiPlot::insertPlot( RimPlot* plot, size_t index )
void RimHistogramMultiPlot::removePlot( RimPlot* plot )
{
auto* sumPlot = dynamic_cast<RimHistogramPlot*>( plot );
CVF_ASSERT( sumPlot != nullptr );
CAF_ASSERT( sumPlot != nullptr );
if ( sumPlot )
{
RimMultiPlot::removePlot( plot );
@@ -117,7 +117,7 @@ void RimHistogramMultiPlot::removePlot( RimPlot* plot )
void RimHistogramMultiPlot::removePlotNoUpdate( RimPlot* plot )
{
auto* sumPlot = dynamic_cast<RimHistogramPlot*>( plot );
CVF_ASSERT( sumPlot != nullptr );
CAF_ASSERT( sumPlot != nullptr );
if ( sumPlot )
{
RimMultiPlot::removePlotNoUpdate( plot );