Commit 2987efc5 authored by Ralf Mueller's avatar Ralf Mueller 🎣
Browse files

updates for swig 4.0.0

parent 2ec851cb
This diff is collapsed.
This diff is collapsed.
...@@ -4,6 +4,6 @@ streamID = CdiLib.streamOpenRead(ifile) ...@@ -4,6 +4,6 @@ streamID = CdiLib.streamOpenRead(ifile)
vlistID = CdiLib.streamInqVlist(streamID) vlistID = CdiLib.streamInqVlist(streamID)
nvars = CdiLib.vlistNvars(vlistID) nvars = CdiLib.vlistNvars(vlistID)
for i in range(0,nvars): for i in range(0,nvars):
print CdiLib.vlistInqVarCode(vlistID, i), print(CdiLib.vlistInqVarCode(vlistID, i))
CdiLib.streamClose(streamID) CdiLib.streamClose(streamID)
This diff is collapsed.
...@@ -29009,7 +29009,7 @@ _wrap_CdiTaxis_name_set(int argc, VALUE *argv, VALUE self) { ...@@ -29009,7 +29009,7 @@ _wrap_CdiTaxis_name_set(int argc, VALUE *argv, VALUE self) {
char *arg2 ; char *arg2 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
char temp2[128] ; char temp2[CDI_MAX_NAME] ;
int res2 ; int res2 ;
if ((argc < 1) || (argc > 1)) { if ((argc < 1) || (argc > 1)) {
...@@ -29020,13 +29020,13 @@ _wrap_CdiTaxis_name_set(int argc, VALUE *argv, VALUE self) { ...@@ -29020,13 +29020,13 @@ _wrap_CdiTaxis_name_set(int argc, VALUE *argv, VALUE self) {
SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "CdiTaxis *","name", 1, self )); SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "CdiTaxis *","name", 1, self ));
} }
arg1 = reinterpret_cast< CdiTaxis * >(argp1); arg1 = reinterpret_cast< CdiTaxis * >(argp1);
res2 = SWIG_AsCharArray(argv[0], temp2, 128); res2 = SWIG_AsCharArray(argv[0], temp2, CDI_MAX_NAME);
if (!SWIG_IsOK(res2)) { if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char [128]","name", 2, argv[0] )); SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char [CDI_MAX_NAME]","name", 2, argv[0] ));
} }
arg2 = reinterpret_cast< char * >(temp2); arg2 = reinterpret_cast< char * >(temp2);
if (arg2) memcpy(arg1->name,arg2,128*sizeof(char)); if (arg2) memcpy(arg1->name,arg2,CDI_MAX_NAME*sizeof(char));
else memset(arg1->name,0,128*sizeof(char)); else memset(arg1->name,0,CDI_MAX_NAME*sizeof(char));
return Qnil; return Qnil;
fail: fail:
return Qnil; return Qnil;
...@@ -29051,7 +29051,7 @@ _wrap_CdiTaxis_name_get(int argc, VALUE *argv, VALUE self) { ...@@ -29051,7 +29051,7 @@ _wrap_CdiTaxis_name_get(int argc, VALUE *argv, VALUE self) {
arg1 = reinterpret_cast< CdiTaxis * >(argp1); arg1 = reinterpret_cast< CdiTaxis * >(argp1);
result = (char *)(char *) ((arg1)->name); result = (char *)(char *) ((arg1)->name);
{ {
size_t size = SWIG_strnlen(result, 128); size_t size = SWIG_strnlen(result, CDI_MAX_NAME);
...@@ -33568,7 +33568,6 @@ SWIGEXPORT void Init_CdiObj(void) { ...@@ -33568,7 +33568,6 @@ SWIGEXPORT void Init_CdiObj(void) {
SwigClassGridsMap.mark = 0; SwigClassGridsMap.mark = 0;
SwigClassGridsMap.destroy = (void (*)(void *)) free_std_map_Sl_int_Sc_CdiGrid_Sg_; SwigClassGridsMap.destroy = (void (*)(void *)) free_std_map_Sl_int_Sc_CdiGrid_Sg_;
SwigClassGridsMap.trackObjects = 0; SwigClassGridsMap.trackObjects = 0;
rb_define_const(mCdiObj, "CHARSIZE", SWIG_From_int(static_cast< int >(128)));
SwigClassCdiGrid.klass = rb_define_class_under(mCdiObj, "CdiGrid", rb_cObject); SwigClassCdiGrid.klass = rb_define_class_under(mCdiObj, "CdiGrid", rb_cObject);
SWIG_TypeClientData(SWIGTYPE_p_CdiGrid, (void *) &SwigClassCdiGrid); SWIG_TypeClientData(SWIGTYPE_p_CdiGrid, (void *) &SwigClassCdiGrid);
require 'CdiLib' require './CdiLib'
include CdiLib include CdiLib
ifile = ARGV[0].nil? ? "../testdata/mulval.nc" : ARGV[0] ifile = ARGV[0].nil? ? "../testdata/mulval.nc" : ARGV[0]
streamID = streamOpenRead(ifile) streamID = streamOpenRead(ifile)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment