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 build warning and error

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-11-20 08:57:20 +01:00
parent 31a84181e6
commit e0b6062eca
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,7 +583,7 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
channelData[chIdx] = wellLogFileData->values(channelName); channelData[chIdx] = wellLogFileData->values(channelName);
if (channelData[chIdx].size()) if (channelData[chIdx].size())
{ {
sortedChannels.insert( {-fabs(channelData[chIdx].front()), channelName, chIdx} ); sortedChannels.insert(std::tuple<double, QString, size_t>(-fabs(channelData[chIdx].front()), channelName, chIdx) );
} }
} }

2
Fwk/AppFwk/cafCommand/cafCmdFeatureMenuBuilder.cpp
View File

@ -154,7 +154,7 @@ void CmdFeatureMenuBuilder::appendToMenu(QMenu* menu)
CVF_ASSERT(menu); CVF_ASSERT(menu);
std::vector<QMenu*> menus = { menu }; std::vector<QMenu*> menus = { menu };
for (int i = 0; i < m_items.size(); i++) for (size_t i = 0; i < m_items.size(); i++)
{ {
if (m_items[i].itemType == MenuItem::SEPARATOR) if (m_items[i].itemType == MenuItem::SEPARATOR)
{ {