From 65f4a5e089af192dcfdf2bcc2220a3a6e3cdfe89 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 7 Jan 2020 13:08:07 +0100 Subject: [PATCH] Fix signed/unsigned compare --- .../UserInterface/RiuCellAndNncPickEventHandler.cpp | 6 +++--- ApplicationCode/UserInterface/RiuResultTextBuilder.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ApplicationCode/UserInterface/RiuCellAndNncPickEventHandler.cpp b/ApplicationCode/UserInterface/RiuCellAndNncPickEventHandler.cpp index faffd995f7..15957c9d84 100644 --- a/ApplicationCode/UserInterface/RiuCellAndNncPickEventHandler.cpp +++ b/ApplicationCode/UserInterface/RiuCellAndNncPickEventHandler.cpp @@ -126,7 +126,7 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve std::array intersectionTriangleHit; RimGeoMechResultDefinition* geomResDef = nullptr; RimEclipseResultDefinition* eclResDef = nullptr; - size_t timestepIndex = -1; + size_t timestepIndex = cvf::UNDEFINED_SIZE_T; // clang-format off if ( const RivSourceInfo* rivSourceInfo = dynamic_cast( firstHitPart->sourceInfo() ) ) @@ -245,13 +245,13 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve if ( eclipseView ) { if ( !eclResDef ) eclResDef = eclipseView->cellResult(); - if ( timestepIndex == -1 ) timestepIndex = eclipseView->currentTimeStep(); + if ( timestepIndex == cvf::UNDEFINED_SIZE_T ) timestepIndex = eclipseView->currentTimeStep(); } if ( geomView ) { if ( !geomResDef ) geomResDef = geomView->cellResult(); - if ( timestepIndex == -1 ) timestepIndex = geomView->currentTimeStep(); + if ( timestepIndex == cvf::UNDEFINED_SIZE_T ) timestepIndex = geomView->currentTimeStep(); } } diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index c1fd4f88dd..60e5e4e4d6 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp @@ -494,8 +494,8 @@ QString RiuResultTextBuilder::nncResultText() // clang-format off if ( fmIndexPair.first >= 0 && fmIndexPair.second >= 0 && - fmNames.size() > fmIndexPair.first && - fmNames.size() > fmIndexPair.second ) + static_cast(fmNames.size()) > fmIndexPair.first && + static_cast(fmNames.size()) > fmIndexPair.second ) { resultValueText = fmNames[fmIndexPair.first] + " - " + fmNames[fmIndexPair.second];