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

7
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
View File

@@ -23,13 +23,14 @@
#include "RivCellSetEnum.h"
#include "RivReservoirPartMgr.h" // Must include here because of caf::FixedArray<RivReservoirPartMgr, PROPERTY_FILTERED>
#include "cafFixedArray.h"
#include "cvfArray.h"
#include "cvfBase.h"
#include "cvfTransform.h"
#include "cafPdmObject.h"
#include <array>
class RimEclipseView;
class RigGridBase;
class RimCellRangeFilterCollection;
@@ -143,8 +144,8 @@ private:
private:
caf::FixedArray<RivReservoirPartMgr, PROPERTY_FILTERED> m_geometries;
caf::FixedArray<bool, PROPERTY_FILTERED> m_geometriesNeedsRegen;
std::array<RivReservoirPartMgr, PROPERTY_FILTERED> m_geometries;
std::array<bool, PROPERTY_FILTERED> m_geometriesNeedsRegen;
cvf::Collection<RivReservoirPartMgr> m_propFilteredGeometryFrames;
std::vector<uchar> m_propFilteredGeometryFramesNeedsRegen;