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

Fixes to make gcc14 compile

Browse Source
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2025-06-05 08:59:28 +02:00
1 parent fbc407aa49
commit 9f0ce0d498
4 files changed
+9 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
+2 -2
View File
@@ -386,7 +386,7 @@ void RimSummaryCaseMainCollection::initAfterRead()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCaseMainCollection::loadSummaryCaseData( std::vector<RimSummaryCase*> summaryCases )
void RimSummaryCaseMainCollection::loadSummaryCaseData( const std::vector<RimSummaryCase*>& summaryCases )
{
std::vector<RimFileSummaryCase*> fileSummaryCases;
std::vector<RimSummaryCase*> otherSummaryCases;
@@ -442,7 +442,7 @@ void RimSummaryCaseMainCollection::loadSummaryCaseData( std::vector<RimSummaryCa
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCaseMainCollection::loadFileSummaryCaseData( std::vector<RimFileSummaryCase*> fileSummaryCases )
void RimSummaryCaseMainCollection::loadFileSummaryCaseData( const std::vector<RimFileSummaryCase*>& fileSummaryCases )
{
RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h
+2 -2
View File
@@ -81,8 +81,8 @@ public:
private:
void initAfterRead() override;
static void loadSummaryCaseData( std::vector<RimSummaryCase*> summaryCases );
static void loadFileSummaryCaseData( std::vector<RimFileSummaryCase*> fileSummaryCases );
static void loadSummaryCaseData( const std::vector<RimSummaryCase*>& summaryCases );
static void loadFileSummaryCaseData( const std::vector<RimFileSummaryCase*>& fileSummaryCases );
static RimSummaryEnsemble* defaultAllocator();
void onCaseNameChanged( const SignalEmitter* emitter );
ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp
+3 -3
View File
@@ -719,8 +719,8 @@ void RigCaseCellResultsData::clearAllResults()
/// Removes all the actual numbers put into this object, and frees up the memory.
/// Does not touch the metadata in any way
//--------------------------------------------------------------------------------------------------
void RigCaseCellResultsData::freeAllocatedResultsData( std::vector<RiaDefines::ResultCatType> categoriesToExclude,
std::optional<size_t> timeStepIndexToRelease )
void RigCaseCellResultsData::freeAllocatedResultsData( const std::vector<RiaDefines::ResultCatType>& categoriesToExclude,
std::optional<size_t> timeStepIndexToRelease )
{
for ( size_t resultIdx = 0; resultIdx < m_cellScalarResults.size(); ++resultIdx )
{
@@ -736,7 +736,7 @@ void RigCaseCellResultsData::freeAllocatedResultsData( std::vector<RiaDefines::R
for ( size_t index = 0; index < m_cellScalarResults[resultIdx].size(); index++ )
{
if ( timeStepIndexToRelease && index != *timeStepIndexToRelease )
if ( timeStepIndexToRelease.has_value() && index != timeStepIndexToRelease.value() )
{
// Keep generated results for these time steps
continue;
ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.h
+2 -1
View File
@@ -120,7 +120,8 @@ public:
void clearScalarResult( RiaDefines::ResultCatType type, const QString& resultName );
void clearScalarResult( const RigEclipseResultAddress& resultAddress );
void clearAllResults();
void freeAllocatedResultsData( std::vector<RiaDefines::ResultCatType> categoriesToExclude, std::optional<size_t> timeStepIndexToRelease );
void freeAllocatedResultsData( const std::vector<RiaDefines::ResultCatType>& categoriesToExclude,
std::optional<size_t> timeStepIndexToRelease );
void eraseAllSourSimData();
void setRemovedTagOnGeneratedResult( const RigEclipseResultAddress& resultAddress );