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:
Magne Sjaastad
2022-11-25 08:59:10 +01:00
committed by GitHub
parent 69ccce225c
commit dfa1bc2cd0
12 changed files with 24 additions and 14 deletions

View File

@@ -22,6 +22,10 @@
#ifdef _MSC_VER
#pragma warning( disable : 4996 )
#endif
#ifdef __GNUC__
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -199,7 +199,7 @@ const RifRftSegmentData* RifRftSegment::segmentData( int segmentNumber ) 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] );
}