OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux compile fixes

Browse Source
This commit is contained in:
Jacob Storen 2015-10-20 02:48:07 -07:00
parent 8b894d8515
commit b5bb62ed0a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp
View File

@ -45,9 +45,9 @@ TEST(RimWellLogExtractionCurveImplTest, StripOffHugeValAtEndsAndInteriorOfVector
std::vector< std::pair<size_t, size_t> > valuesIntervals; std::vector< std::pair<size_t, size_t> > valuesIntervals;
RigWellLogCurveDataTestInterface::calculateIntervalsOfValidValues(values, &valuesIntervals); RigWellLogCurveDataTestInterface::calculateIntervalsOfValidValues(values, &valuesIntervals);
EXPECT_EQ(2, valuesIntervals.size()); EXPECT_EQ(2, static_cast<int>(valuesIntervals.size()));
EXPECT_EQ(2, valuesIntervals[0].first); EXPECT_EQ(2, static_cast<int>(valuesIntervals[0].first));
EXPECT_EQ(2, valuesIntervals[0].second); EXPECT_EQ(2, static_cast<int>(valuesIntervals[0].second));
EXPECT_EQ(5, valuesIntervals[1].first); EXPECT_EQ(5, static_cast<int>(valuesIntervals[1].first));
EXPECT_EQ(6, valuesIntervals[1].second); EXPECT_EQ(6, static_cast<int>(valuesIntervals[1].second));
} }

2
ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.cpp
View File

@ -124,7 +124,7 @@ void RimWellLogPlotTrack::addCurve(RimWellLogPlotCurve* curve)
void RimWellLogPlotTrack::removeCurve(RimWellLogPlotCurve* curve) void RimWellLogPlotTrack::removeCurve(RimWellLogPlotCurve* curve)
{ {
size_t index = curves.index(curve); size_t index = curves.index(curve);
if (index >= 0 && index < curves.size()) if ( index < curves.size())
{ {
curves[index]->detachCurve(); curves[index]->detachCurve();
curves.removeChildObject(curve); curves.removeChildObject(curve);

2
ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.h
View File

@ -18,6 +18,8 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#pragma once #pragma once
#include <stddef.h>
class RimCellRangeFilter; class RimCellRangeFilter;
class RigMainGrid; class RigMainGrid;
class RigFemPart; class RigFemPart;