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

Make new code follow new C++17 guidelines

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-10-22 08:52:45 +02:00
parent 90df4b8b54
commit 19a2e92a0a
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp
View File

@@ -315,12 +315,10 @@ void RigWellLogExtractor::populateReturnArrays( std::map<RigMDCellIdxEnterLeaveK
}
}
void RigWellLogExtractor::appendIntersectionToArrays( double measuredDepth,
const HexIntersectionInfo& intersection,
QStringList* errorMessages )
void RigWellLogExtractor::appendIntersectionToArrays( double measuredDepth,
const HexIntersectionInfo& intersection,
gsl::not_null<QStringList*> errorMessages )
{
CVF_ASSERT( errorMessages );
QString errorMessage;
if ( !m_intersectionMeasuredDepths.empty() && measuredDepth < m_intersectionMeasuredDepths.back() )
{

17
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h
View File

@@ -19,18 +19,19 @@
#pragma once
#include "RigHexIntersectionTools.h"
#include "RigWellLogExtractionTools.h"
#include "cvfMath.h"
#include "cvfObject.h"
#include "cvfStructGrid.h"
#include "cvfVector3.h"
#include <gsl/gsl>
#include <map>
#include <vector>
#include "cvfStructGrid.h"
#include "RigHexIntersectionTools.h"
#include "RigWellLogExtractionTools.h"
//==================================================================================================
///
//==================================================================================================
@@ -78,9 +79,9 @@ protected:
std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo>* uniqueIntersections );
void populateReturnArrays( std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo>& uniqueIntersections );
void appendIntersectionToArrays( double measuredDepth,
const HexIntersectionInfo& intersection,
QStringList* errorMessages );
void appendIntersectionToArrays( double measuredDepth,
const HexIntersectionInfo& intersection,
gsl::not_null<QStringList*> errorMessages );
virtual cvf::Vec3d
calculateLengthInCell( size_t cellIndex, const cvf::Vec3d& startPoint, const cvf::Vec3d& endPoint ) const = 0;