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

#3962 Octave : Replace deprecated function is_numeric_type

Browse Source
This commit is contained in:
Magne Sjaastad
2019-01-15 07:28:50 +01:00
parent 791a896be4
commit fff68b3ea6
18 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OctavePlugin/riGetActiveCellProperty.cpp
View File

@@ -139,7 +139,7 @@ DEFUN_DLD (riGetActiveCellProperty, args, nargout,
argIndices.push_back(3);
// Check if we have a CaseId:
if (!args(argIndices[0]).is_numeric_type())
if (!riOctavePlugin::isOctaveValueNumeric(args(argIndices[0])))
{
argIndices[0] = -1;
for (size_t aIdx = 1; aIdx < argIndices.size(); ++aIdx)
@@ -148,7 +148,7 @@ DEFUN_DLD (riGetActiveCellProperty, args, nargout,
// Check if we have a Requested TimeSteps
if (!(nargin > argIndices[2] && (args(argIndices[2]).is_matrix_type() || args(argIndices[2]).is_numeric_type()) && !args(argIndices[2]).is_string()))
if (!(nargin > argIndices[2] && (args(argIndices[2]).is_matrix_type() || riOctavePlugin::isOctaveValueNumeric(args(argIndices[2]))) && !args(argIndices[2]).is_string()))
{
argIndices[2] = -1;
for (size_t aIdx = 3; aIdx < argIndices.size(); ++aIdx)