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

GCC: Fix warning related to memory alignment seen on gcc11

Browse Source
This commit is contained in:
Magne Sjaastad 2023-12-18 08:26:40 +01:00
parent 6cc8855606
commit e583c3a994
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/FileInterface/RifReaderEnsembleStatisticsRft.h
View File

@ -29,7 +29,7 @@ class RimSummaryCaseCollection;
class RimEclipseCase; class RimEclipseCase;
class RigWellPath; class RigWellPath;
class RifReaderEnsembleStatisticsRft : public RifReaderRftInterface, public cvf::Object class RifReaderEnsembleStatisticsRft : public RifReaderRftInterface
{ {
public: public:
RifReaderEnsembleStatisticsRft( const RimSummaryCaseCollection* summaryCaseCollection, RimEclipseCase* eclipseCase ); RifReaderEnsembleStatisticsRft( const RimSummaryCaseCollection* summaryCaseCollection, RimEclipseCase* eclipseCase );

4
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp
View File

@ -167,7 +167,7 @@ std::vector<QString> RimWellRftEnsembleCurveSet::parametersWithVariation() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellRftEnsembleCurveSet::clearEnsembleStatistics() void RimWellRftEnsembleCurveSet::clearEnsembleStatistics()
{ {
m_statisticsEclipseRftReader = new RifReaderEnsembleStatisticsRft( m_ensemble(), m_eclipseCase() ); m_statisticsEclipseRftReader = std::make_unique<RifReaderEnsembleStatisticsRft>( m_ensemble(), m_eclipseCase() );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -227,7 +227,7 @@ RimEclipseCase* RimWellRftEnsembleCurveSet::eclipseCase() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RifReaderRftInterface* RimWellRftEnsembleCurveSet::statisticsEclipseRftReader() RifReaderRftInterface* RimWellRftEnsembleCurveSet::statisticsEclipseRftReader()
{ {
return m_statisticsEclipseRftReader.p(); return m_statisticsEclipseRftReader.get();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.h
View File

@ -87,7 +87,7 @@ private:
caf::PdmField<QString> m_ensembleParameter; caf::PdmField<QString> m_ensembleParameter;
caf::PdmChildField<RimRegularLegendConfig*> m_ensembleLegendConfig; caf::PdmChildField<RimRegularLegendConfig*> m_ensembleLegendConfig;
cvf::ref<RifReaderEnsembleStatisticsRft> m_statisticsEclipseRftReader; std::unique_ptr<RifReaderEnsembleStatisticsRft> m_statisticsEclipseRftReader;
protected: protected:
void initAfterRead() override; void initAfterRead() override;