mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Some fixes for new gcc/clang
Minor fixes for newer gcc/clang. These issues were seen when using ubuntu-latest (Ubuntu 22.04) on Github Actions.
This commit is contained in:
parent
69ccce225c
commit
dfa1bc2cd0
@ -27,6 +27,10 @@
|
|||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning( disable : 4996 )
|
#pragma warning( disable : 4996 )
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef __GNUC__
|
||||||
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
#endif
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -23,6 +23,9 @@
|
|||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning( disable : 4996 )
|
#pragma warning( disable : 4996 )
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef __GNUC__
|
||||||
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
#endif
|
||||||
|
|
||||||
//==================================================================================================
|
//==================================================================================================
|
||||||
//
|
//
|
||||||
|
@ -26,6 +26,9 @@
|
|||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning( disable : 4996 )
|
#pragma warning( disable : 4996 )
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef __GNUC__
|
||||||
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
#endif
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
|
@ -676,9 +676,6 @@ void RicWellPathExportMswCompletionsImpl::generateFishbonesMswExportInfo(
|
|||||||
double maxSegmentLength = enableSegmentSplitting ? mswParameters->maxSegmentLength()
|
double maxSegmentLength = enableSegmentSplitting ? mswParameters->maxSegmentLength()
|
||||||
: std::numeric_limits<double>::infinity();
|
: std::numeric_limits<double>::infinity();
|
||||||
|
|
||||||
double subStartMD = wellPath->fishbonesCollection()->startMD();
|
|
||||||
double subStartTVD = RicMswTableFormatterTools::tvdFromMeasuredDepth( branch->wellPath(), subStartMD );
|
|
||||||
|
|
||||||
auto unitSystem = exportInfo->unitSystem();
|
auto unitSystem = exportInfo->unitSystem();
|
||||||
|
|
||||||
for ( RimFishbones* subs : fishbonesSubs )
|
for ( RimFishbones* subs : fishbonesSubs )
|
||||||
@ -808,9 +805,6 @@ void RicWellPathExportMswCompletionsImpl::generateFishbonesMswExportInfo(
|
|||||||
segmentOnParentBranch->addCompletion( std::move( icdCompletion ) );
|
segmentOnParentBranch->addCompletion( std::move( icdCompletion ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
subStartMD = subEndMD;
|
|
||||||
subStartTVD = subEndTVD;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
exportInfo->setHasSubGridIntersections( exportInfo->hasSubGridIntersections() || foundSubGridIntersections );
|
exportInfo->setHasSubGridIntersections( exportInfo->hasSubGridIntersections() || foundSubGridIntersections );
|
||||||
|
@ -22,6 +22,10 @@
|
|||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning( disable : 4996 )
|
#pragma warning( disable : 4996 )
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef __GNUC__
|
||||||
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
#endif
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -199,7 +199,7 @@ const RifRftSegmentData* RifRftSegment::segmentData( int segmentNumber ) const
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
const RifRftSegmentData* RifRftSegment::segmentDataByIndex( int segmentIndex ) const
|
const RifRftSegmentData* RifRftSegment::segmentDataByIndex( int segmentIndex ) const
|
||||||
{
|
{
|
||||||
CVF_ASSERT( segmentIndex < m_topology.size() );
|
CVF_ASSERT( segmentIndex < static_cast<int>( m_topology.size() ) );
|
||||||
|
|
||||||
return &( m_topology[segmentIndex] );
|
return &( m_topology[segmentIndex] );
|
||||||
}
|
}
|
||||||
|
@ -29,6 +29,9 @@
|
|||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning( disable : 4996 )
|
#pragma warning( disable : 4996 )
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef __GNUC__
|
||||||
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
#endif
|
||||||
|
|
||||||
CAF_PDM_SOURCE_INIT( RimProcess, "RimProcess" );
|
CAF_PDM_SOURCE_INIT( RimProcess, "RimProcess" );
|
||||||
|
|
||||||
@ -146,7 +149,6 @@ bool RimProcess::execute()
|
|||||||
QObject::connect( proc, SIGNAL( started() ), m_monitor, SLOT( started() ) );
|
QObject::connect( proc, SIGNAL( started() ), m_monitor, SLOT( started() ) );
|
||||||
|
|
||||||
bool retval = false;
|
bool retval = false;
|
||||||
|
|
||||||
proc->start( cmd );
|
proc->start( cmd );
|
||||||
if ( proc->waitForStarted( -1 ) )
|
if ( proc->waitForStarted( -1 ) )
|
||||||
{
|
{
|
||||||
|
@ -2901,7 +2901,7 @@ void RigCaseCellResultsData::computeCompletionTypeForTimeStep( size_t timeStep )
|
|||||||
|
|
||||||
// If permeabilities are generated by calculations, make sure that generated data is calculated
|
// If permeabilities are generated by calculations, make sure that generated data is calculated
|
||||||
// See RicExportFractureCompletionsImpl::generateCompdatValues()
|
// See RicExportFractureCompletionsImpl::generateCompdatValues()
|
||||||
for ( const QString& propertyName : { "PERMX", "PERMY", "PERMZ" } )
|
for ( const QString propertyName : { "PERMX", "PERMY", "PERMZ" } )
|
||||||
{
|
{
|
||||||
for ( auto userCalculation : RimProject::current()->gridCalculationCollection()->calculations() )
|
for ( auto userCalculation : RimProject::current()->gridCalculationCollection()->calculations() )
|
||||||
{
|
{
|
||||||
|
@ -99,7 +99,8 @@ private:
|
|||||||
SourceAddress( QString primary = "",
|
SourceAddress( QString primary = "",
|
||||||
QString secondary = "",
|
QString secondary = "",
|
||||||
QString units = RiaWellLogUnitTools<double>::noUnitString() )
|
QString units = RiaWellLogUnitTools<double>::noUnitString() )
|
||||||
: primary( primary )
|
: resType( RIG_NODAL )
|
||||||
|
, primary( primary )
|
||||||
, secondary( secondary )
|
, secondary( secondary )
|
||||||
, units( units )
|
, units( units )
|
||||||
{
|
{
|
||||||
|
@ -100,8 +100,7 @@ class RiuBarChartScaleDraw : public QwtScaleDraw
|
|||||||
public:
|
public:
|
||||||
struct RiuBarChartTick
|
struct RiuBarChartTick
|
||||||
{
|
{
|
||||||
RiuBarChartTick() = default;
|
RiuBarChartTick() = default;
|
||||||
RiuBarChartTick( const RiuBarChartTick& rhs ) = default;
|
|
||||||
RiuBarChartTick( QwtScaleDiv::TickType tickType, const QString& label, bool oppositeSide = false )
|
RiuBarChartTick( QwtScaleDiv::TickType tickType, const QString& label, bool oppositeSide = false )
|
||||||
: tickType( tickType )
|
: tickType( tickType )
|
||||||
, label( label )
|
, label( label )
|
||||||
|
@ -25,7 +25,7 @@ class RiuMdiSubWindow : public QMdiSubWindow
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
RiuMdiSubWindow( QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr );
|
RiuMdiSubWindow( QWidget* parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags() );
|
||||||
|
|
||||||
~RiuMdiSubWindow() override;
|
~RiuMdiSubWindow() override;
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ public:
|
|||||||
const QGLFormat& format,
|
const QGLFormat& format,
|
||||||
QWidget* parent,
|
QWidget* parent,
|
||||||
OpenGLWidget* shareWidget = nullptr,
|
OpenGLWidget* shareWidget = nullptr,
|
||||||
Qt::WindowFlags f = nullptr );
|
Qt::WindowFlags f = Qt::WindowFlags() );
|
||||||
OpenGLWidget( OpenGLWidget* shareWidget, QWidget* parent, Qt::WindowFlags f = Qt::WindowFlags() );
|
OpenGLWidget( OpenGLWidget* shareWidget, QWidget* parent, Qt::WindowFlags f = Qt::WindowFlags() );
|
||||||
|
|
||||||
cvf::OpenGLContext* cvfOpenGLContext() const;
|
cvf::OpenGLContext* cvfOpenGLContext() const;
|
||||||
|
Loading…
Reference in New Issue
Block a user