jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scilab: return SWIG_OK or SWIG_ERROR (instead of 0)

Browse source
This commit is contained in:
Simon Marchetto 2014-03-14 11:11:49 +01:00
commit d47d3c0633
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/scilab/scicontainer.swg
View file

@ -216,7 +216,7 @@ namespace swig
} }
else else
{ {
return 0; return SWIG_ERROR;
} }
} }
@ -432,7 +432,7 @@ namespace swig {
} }
return traits_from_sequence<value_type>::set(size, data); return traits_from_sequence<value_type>::set(size, data);
} }
return 0; return SWIG_OK;
} }
catch (std::exception& e) catch (std::exception& e)
{ {

4
Lib/scilab/scistdcommon.swg
View file

@ -4,7 +4,7 @@ namespace swig {
// Traits that provides the from method // Traits that provides the from method
template <class Type> struct traits_from_ptr { template <class Type> struct traits_from_ptr {
static SwigSciObject from(Type *val, int owner = 0) { static SwigSciObject from(Type *val, int owner = 0) {
return 0; //SWIG_NewPointerObj(val, type_info<Type>(), owner); return SWIG_OK; //SWIG_NewPointerObj(val, type_info<Type>(), owner);
} }
}; };
@ -153,7 +153,7 @@ namespace swig {
%type_error(swig::type_name<Type>()); %type_error(swig::type_name<Type>());
} }
if (throw_error) throw std::invalid_argument("bad type"); if (throw_error) throw std::invalid_argument("bad type");
return 0; return SWIG_OK;
} }
} }
}; };

14
Lib/scilab/scitypemaps.swg
View file

@ -34,7 +34,7 @@
%define %scilab_inptr_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE) %define %scilab_inptr_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE { %typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
if (FRAGMENTNAME(pvApiCtx, $input, %as_voidptrptr(&$1), fname) != SWIG_OK) { if (FRAGMENTNAME(pvApiCtx, $input, %as_voidptrptr(&$1), fname) != SWIG_OK) {
return 0; return SWIG_ERROR;
} }
} }
%enddef %enddef
@ -42,7 +42,7 @@
%define %scilab_out_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE) %define %scilab_out_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE { %typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
if (FRAGMENTNAME(pvApiCtx, $result, $1) != SWIG_OK) { if (FRAGMENTNAME(pvApiCtx, $result, $1) != SWIG_OK) {
return 0; return SWIG_ERROR;
} }
} }
%enddef %enddef
@ -50,7 +50,7 @@
%define %scilab_outptr_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE) %define %scilab_outptr_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE { %typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
if (FRAGMENTNAME(pvApiCtx, $result, %as_voidptr($1)) != SWIG_OK) { if (FRAGMENTNAME(pvApiCtx, $result, %as_voidptr($1)) != SWIG_OK) {
return 0; return SWIG_ERROR;
} }
} }
%enddef %enddef
@ -58,7 +58,7 @@
%define %scilab_varout_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE) %define %scilab_varout_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE { %typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
if (FRAGMENTNAME(pvApiCtx, $result, $value) != SWIG_OK) { if (FRAGMENTNAME(pvApiCtx, $result, $value) != SWIG_OK) {
return 0; return SWIG_ERROR;
} }
} }
%enddef %enddef
@ -66,7 +66,7 @@
%define %scilab_varoutptr_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE) %define %scilab_varoutptr_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE { %typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
if (FRAGMENTNAME(pvApiCtx, $result, %as_voidptr($value)) != SWIG_OK) { if (FRAGMENTNAME(pvApiCtx, $result, %as_voidptr($value)) != SWIG_OK) {
return 0; return SWIG_ERROR;
} }
} }
%enddef %enddef
@ -74,7 +74,7 @@
%define %scilab_in_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE) %define %scilab_in_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE { %typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
if (FRAGMENTNAME(pvApiCtx, $input, &$1, fname) != SWIG_OK) { if (FRAGMENTNAME(pvApiCtx, $input, &$1, fname) != SWIG_OK) {
return 0; return SWIG_ERROR;
} }
} }
%enddef %enddef
@ -87,7 +87,7 @@
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
%typemap(in, noblock=1, fragment=SWIG_AsVal_frag(Enum)) enum SWIGTYPE (int val) { %typemap(in, noblock=1, fragment=SWIG_AsVal_frag(Enum)) enum SWIGTYPE (int val) {
if (SWIG_AsVal_dec(Enum)($input, &val) != SWIG_OK) { if (SWIG_AsVal_dec(Enum)($input, &val) != SWIG_OK) {
return 0; return SWIG_ERROR;
} }
$1 = %reinterpret_cast(val, $ltype); $1 = %reinterpret_cast(val, $ltype);
} }