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

octave: Revert use of auto for octave version before 7

Browse Source
This commit is contained in:
Magne Sjaastad 2024-01-12 16:42:56 +01:00
parent cfff6ac024
commit 9dfe155c5a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OctavePlugin/riGetActiveCellInfo.cpp
View File

@ -66,7 +66,7 @@ void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, qu
#if OCTAVE_MAJOR_VERSION > 6 #if OCTAVE_MAJOR_VERSION > 6
auto internalMatrixData = (qint32*)activeCellInfo.fortran_vec(); auto internalMatrixData = (qint32*)activeCellInfo.fortran_vec();
#else #else
auto internalMatrixData = (qint32*)activeCellInfo.fortran_vec()->mex_get_data(); qint32* internalMatrixData = (qint32*)activeCellInfo.fortran_vec()->mex_get_data();
#endif #endif
QStringList errorMessages; QStringList errorMessages;

2
OctavePlugin/riGetSelectedCells.cpp
View File

@ -66,7 +66,7 @@ void getSelectedCells(int32NDArray& selectedCellInfo, const QString &hostName, q
#if OCTAVE_MAJOR_VERSION > 6 #if OCTAVE_MAJOR_VERSION > 6
auto internalMatrixData = (qint32*)selectedCellInfo.fortran_vec(); auto internalMatrixData = (qint32*)selectedCellInfo.fortran_vec();
#else #else
auto internalMatrixData = (qint32*)selectedCellInfo.fortran_vec()->mex_get_data(); qint32* internalMatrixData = (qint32*)selectedCellInfo.fortran_vec()->mex_get_data();
#endif #endif
QStringList errorMessages; QStringList errorMessages;

2
OctavePlugin/riSetActiveCellProperty.cpp
View File

@ -57,7 +57,7 @@ void setEclipseProperty(const Matrix& propertyFrames, const QString &hostName, q
#if OCTAVE_MAJOR_VERSION > 6 #if OCTAVE_MAJOR_VERSION > 6
auto internalData = propertyFrames.data(); auto internalData = propertyFrames.data();
#else #else
auto internalData = propertyFrames.fortran_vec(); const double* internalData = propertyFrames.fortran_vec();
#endif #endif
QStringList errorMessages; QStringList errorMessages;

2
OctavePlugin/riSetGridProperty.cpp
View File

@ -74,7 +74,7 @@ void setEclipseProperty(const NDArray& propertyFrames, const QString &hostName,
#if OCTAVE_MAJOR_VERSION > 6 #if OCTAVE_MAJOR_VERSION > 6
auto internalData = propertyFrames.data(); auto internalData = propertyFrames.data();
#else #else
auto internalData = propertyFrames.fortran_vec(); const double* internalData = propertyFrames.fortran_vec();
#endif #endif
QStringList errorMessages; QStringList errorMessages;