Merge pull request #3466 from blattms/fix-compiler-warnings

Fix compiler warnings
This commit is contained in:
Bård Skaflestad 2023-04-12 14:03:20 +02:00 committed by GitHub
commit 9bf9f65f63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 15 deletions

View File

@ -185,10 +185,10 @@ namespace cvf {
size_t fromIdx;
size_t toIdx;
InternalNodeAndRange(AABBTreeNodeInternal* node, size_t fromIdx, size_t toIdx)
: node(node)
, fromIdx(fromIdx)
, toIdx(toIdx)
InternalNodeAndRange(AABBTreeNodeInternal* node_, size_t fromIdx_, size_t toIdx_)
: node(node_)
, fromIdx(fromIdx_)
, toIdx(toIdx_)
{}
};

View File

@ -32,9 +32,9 @@ RigWellPath::RigWellPath()
: cvf::Object()
, m_hasDatumElevation( false )
, m_datumElevation( 0.0 )
, objectBeingDeleted( this )
, m_uniqueStartIndex( 0u )
, m_uniqueEndIndex( std::numeric_limits<size_t>::max() )
, objectBeingDeleted( this )
{
}
@ -64,8 +64,8 @@ RigWellPath::RigWellPath( const std::vector<cvf::Vec3d>& wellPathPoints, const s
, m_hasDatumElevation( false )
, m_datumElevation( 0.0 )
, m_uniqueStartIndex( 0u )
, m_uniqueEndIndex( std::numeric_limits<size_t>::max() )
, objectBeingDeleted( this )
, m_uniqueEndIndex( std::numeric_limits<size_t>::max() )
{
CVF_ASSERT( m_wellPathPoints.size() == m_measuredDepths.size() );
}

View File

@ -926,10 +926,10 @@ void EdgeSplitStorage::canonizeAddress( size_t& edgeP1Index, size_t& edgeP2Index
///
//--------------------------------------------------------------------------------------------------
EarClipTesselator::EarClipTesselator()
: m_X( -1 )
: m_nodeCoords( nullptr )
, m_X( -1 )
, m_Y( -1 )
, m_areaTolerance( 1e-12 )
, m_nodeCoords( nullptr )
{
}

View File

@ -102,11 +102,11 @@ bool HexGridIntersectionTools::planeLineIntersect( const cvf::Plane& plane,
// a) Should not be counted b) May need a tolerance margin to intersect
// as intersecting: both 1->3 and 2->3 as it is theoretically required to:
// 3
// \ /\ /|\
// \ / \ / | \
// \ / \ / | \
// \ / \ / | \
// \/________\ /____|____\
// \ /\ /|\ .
// \ / \ / | \ .
// \ / \ / | \ .
// \ / \ / | \ .
// \/________\ /____|____\ .
// \ 1 | 2
//--------------------------------------------------------------------------------------------------
@ -188,8 +188,8 @@ bool HexGridIntersectionTools::planeTriangleIntersection( const cvf::Plane& plan
CVF_ASSERT( false );
}
bool ok1 = false;
bool ok2 = false;
[[maybe_unused]] bool ok1 = false;
[[maybe_unused]] bool ok2 = false;
if ( topVx == 1 )
{