From a99eae7c2437648f7e21aea2be592ac2aa2abf9e Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 11 Aug 2017 15:22:40 +0200 Subject: [PATCH] Linux : Fix compiler issues --- .../ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp | 4 +++- ApplicationCode/ProjectDataModel/RimView.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp index 498553ac38..5ffc10fb9d 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp @@ -669,7 +669,9 @@ void RimFishbonesMultipleSubs::computeSubLateralIndices() m_subLateralIndices.clear(); for (size_t subIndex = 0; subIndex < m_locationOfSubs().size(); ++subIndex) { - SubLateralIndex subLateralIndex{ subIndex }; + SubLateralIndex subLateralIndex; + subLateralIndex.subIndex = subIndex; + for (size_t lateralIndex = 0; lateralIndex < m_lateralCountPerSub(); ++lateralIndex) { subLateralIndex.lateralIndices.push_back(lateralIndex); diff --git a/ApplicationCode/ProjectDataModel/RimView.cpp b/ApplicationCode/ProjectDataModel/RimView.cpp index 671f29481c..6bf1f3ada9 100644 --- a/ApplicationCode/ProjectDataModel/RimView.cpp +++ b/ApplicationCode/ProjectDataModel/RimView.cpp @@ -740,7 +740,7 @@ void RimView::addDynamicWellPathsToModel(cvf::ModelBasicList* wellPathModelBasic QDateTime currentTimeStamp; std::vector timeStamps = ownerCase()->timeStepDates(); - if (currentTimeStep() < timeStamps.size()) + if (currentTimeStep() < static_cast(timeStamps.size())) { currentTimeStamp = timeStamps[currentTimeStep()]; }