From b5bb62ed0afdc7fb3aab2435977ce80337cda75d Mon Sep 17 00:00:00 2001 From: Jacob Storen Date: Tue, 20 Oct 2015 02:48:07 -0700 Subject: [PATCH] Linux compile fixes --- .../RimWellLogExtractionCurveImpl-Test.cpp | 10 +++++----- .../ProjectDataModel/RimWellLogPlotTrack.cpp | 2 +- .../RigCaseToCaseRangeFilterMapper.h | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp b/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp index cf09abbf28..1597263404 100644 --- a/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp +++ b/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp @@ -45,9 +45,9 @@ TEST(RimWellLogExtractionCurveImplTest, StripOffHugeValAtEndsAndInteriorOfVector std::vector< std::pair > valuesIntervals; RigWellLogCurveDataTestInterface::calculateIntervalsOfValidValues(values, &valuesIntervals); - EXPECT_EQ(2, valuesIntervals.size()); - EXPECT_EQ(2, valuesIntervals[0].first); - EXPECT_EQ(2, valuesIntervals[0].second); - EXPECT_EQ(5, valuesIntervals[1].first); - EXPECT_EQ(6, valuesIntervals[1].second); + EXPECT_EQ(2, static_cast(valuesIntervals.size())); + EXPECT_EQ(2, static_cast(valuesIntervals[0].first)); + EXPECT_EQ(2, static_cast(valuesIntervals[0].second)); + EXPECT_EQ(5, static_cast(valuesIntervals[1].first)); + EXPECT_EQ(6, static_cast(valuesIntervals[1].second)); } diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.cpp index bd0724d0d3..f8ff005241 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.cpp @@ -124,7 +124,7 @@ void RimWellLogPlotTrack::addCurve(RimWellLogPlotCurve* curve) void RimWellLogPlotTrack::removeCurve(RimWellLogPlotCurve* curve) { size_t index = curves.index(curve); - if (index >= 0 && index < curves.size()) + if ( index < curves.size()) { curves[index]->detachCurve(); curves.removeChildObject(curve); diff --git a/ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.h b/ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.h index 2bcae7e1b8..cd266774c7 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.h +++ b/ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.h @@ -18,6 +18,8 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once +#include + class RimCellRangeFilter; class RigMainGrid; class RigFemPart;