OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

System : Avoid file global variables (cotire)

Browse Source 
When multiple files defines the same variable in global file scope, a name clash happens in cotire. Prefer using static const members instead.
This commit is contained in:
Magne Sjaastad
2019-01-16 15:56:16 +01:00
parent bde2c0109c
commit e75362f87e
6 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/RimEclipseContourMapView.cpp
+7 -6
View File
@@ -43,10 +43,11 @@
CAF_PDM_SOURCE_INIT(RimEclipseContourMapView, "RimContourMapView");
const cvf::Mat4d defaultViewMatrix(1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 1000,
0, 0, 0, 1);
const cvf::Mat4d RimEclipseContourMapView::sm_defaultViewMatrix = cvf::Mat4d(1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 1000,
0, 0, 0, 1);
RimEclipseContourMapView::RimEclipseContourMapView()
: m_cameraPositionLastUpdate(cvf::Vec3d::UNDEFINED)
@@ -66,7 +67,7 @@ RimEclipseContourMapView::RimEclipseContourMapView()
m_contourMapProjectionPartMgr = new RivContourMapProjectionPartMgr(contourMapProjection(), this);
((RiuViewerToViewInterface*)this)->setCameraPosition(defaultViewMatrix);
((RiuViewerToViewInterface*)this)->setCameraPosition(sm_defaultViewMatrix);
}
//--------------------------------------------------------------------------------------------------
@@ -181,7 +182,7 @@ void RimEclipseContourMapView::createDisplayModel()
updateGeometry();
}
if (this->viewer()->mainCamera()->viewMatrix() == defaultViewMatrix)
if (this->viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix)
{
this->zoomAll();
}