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

Fix linux compile error and warning

Browse Source
This commit is contained in:
Jacob Støren 2017-10-25 19:44:04 +02:00
parent 12d0457e90
commit c4bc81b2cc
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@ -51,6 +51,8 @@
CAF_PDM_SOURCE_INIT(RimWellPltPlot, "WellPltPlot"); CAF_PDM_SOURCE_INIT(RimWellPltPlot, "WellPltPlot");
namespace caf
{
template<> template<>
void caf::AppEnum< RimWellPltPlot::FlowType>::setUp() 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_GAS, "PHASE_GAS", "Gas");
addItem(RimWellPltPlot::PHASE_WATER, "PHASE_WATER", "Water"); addItem(RimWellPltPlot::PHASE_WATER, "PHASE_WATER", "Water");
} }
}
const QString RimWellPltPlot::OIL_CHANNEL_NAME = "QOZT"; const QString RimWellPltPlot::OIL_CHANNEL_NAME = "QOZT";
const QString RimWellPltPlot::GAS_CHANNEL_NAME = "QGZT"; const QString RimWellPltPlot::GAS_CHANNEL_NAME = "QGZT";

2
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -655,7 +655,7 @@ void RimWellPath::addWellLogFile(RimWellLogFile* logFileInfo)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellPath::removeWellLogFile(const 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) if (m_wellLogFiles[i] == logFileInfo)
{ {