From c4bc81b2cc35aae06dd6ecbf9b980f7e6d546492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 25 Oct 2017 19:44:04 +0200 Subject: [PATCH] Fix linux compile error and warning --- ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp | 3 +++ ApplicationCode/ProjectDataModel/RimWellPath.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 7bae1e78af..fdd2a5deed 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -51,6 +51,8 @@ CAF_PDM_SOURCE_INIT(RimWellPltPlot, "WellPltPlot"); +namespace caf +{ template<> void caf::AppEnum< RimWellPltPlot::FlowType>::setUp() { @@ -65,6 +67,7 @@ void caf::AppEnum< RimWellPltPlot::FlowPhase>::setUp() addItem(RimWellPltPlot::PHASE_GAS, "PHASE_GAS", "Gas"); addItem(RimWellPltPlot::PHASE_WATER, "PHASE_WATER", "Water"); } +} const QString RimWellPltPlot::OIL_CHANNEL_NAME = "QOZT"; const QString RimWellPltPlot::GAS_CHANNEL_NAME = "QGZT"; diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.cpp b/ApplicationCode/ProjectDataModel/RimWellPath.cpp index 7b73fc7f38..51da29cdea 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp @@ -655,7 +655,7 @@ void RimWellPath::addWellLogFile(RimWellLogFile* logFileInfo) //-------------------------------------------------------------------------------------------------- void RimWellPath::removeWellLogFile(const RimWellLogFile* logFileInfo) { - for (int i = 0; i < m_wellLogFiles.size(); i++) + for (size_t i = 0; i < m_wellLogFiles.size(); i++) { if (m_wellLogFiles[i] == logFileInfo) {