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

#3185 Remove FixedArray

Browse Source
This commit is contained in:
Magne Sjaastad
2018-08-07 10:37:52 +02:00
parent aeae19c748
commit 8425ea96ad
17 changed files with 45 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@@ -32,6 +32,7 @@
#include "cafPdmUiTreeOrdering.h"
#include "cvfMath.h"
#include <array>
namespace caf
{
@@ -193,7 +194,7 @@ QList<caf::PdmOptionItemInfo> RimCellEdgeColors::calculateValueOptions(const caf
QList<caf::PdmOptionItemInfo> options;
std::map<QString, caf::FixedArray<QString, 6> > varBaseNameToVarsMap;
std::map<QString, std::array<QString, 6> > varBaseNameToVarsMap;
int i;
for (i = 0; i < varList.size(); ++i)
@@ -213,7 +214,7 @@ QList<caf::PdmOptionItemInfo> RimCellEdgeColors::calculateValueOptions(const caf
}
}
std::map<QString, caf::FixedArray<QString, 6> >::iterator it;
std::map<QString, std::array<QString, 6> >::iterator it;
for (it = varBaseNameToVarsMap.begin(); it != varBaseNameToVarsMap.end(); ++it)
{