OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-09 15:43:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use Octave_map instead of octave_scalar_map when building Octave data structures

Browse Source 
p4#: 21615
This commit is contained in:
Magne Sjaastad 2013-05-15 06:55:54 +02:00
parent f5b779d4c4
commit 8c29270294
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OctavePlugin/riGetCurrentCase.cpp
View File

@ -1,6 +1,6 @@
#include <QtNetwork>
#include <octave/oct.h>
#include <octave/ov-struct.h>
#include <octave/oct-map.h>
#include "riSettings.h"
@ -97,13 +97,10 @@ DEFUN_DLD (riGetCurrentCase, args, nargout,
getCurrentCase(caseId, caseName, caseType, caseGroupId, "127.0.0.1", 40001);
charMatrix ch;
ch.resize(1, caseName.length());
ch.insert(caseName.toLatin1().data(), 0, 0);
Octave_map fieldMap;
octave_scalar_map fieldMap;
fieldMap.assign(riOctavePlugin::caseInfo_CaseId, caseId);
fieldMap.assign(riOctavePlugin::caseInfo_CaseName, ch);
fieldMap.assign(riOctavePlugin::caseInfo_CaseName, caseName.toLatin1().data());
fieldMap.assign(riOctavePlugin::caseInfo_CaseType, caseType);
fieldMap.assign(riOctavePlugin::caseInfo_CaseGroupId, caseGroupId);

4
OctavePlugin/riSettings.h
View File

@ -29,7 +29,3 @@ namespace riOctavePlugin
char caseInfo_CaseGroupId[] = "CaseGroupId";
}
// Support previous name Octave_map of class octave_scalar_map
#ifndef OCTAVE_API_VERSION_NUMBER
#define octave_scalar_map Octave_map
#endif