fix ifdefs for directors
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7738 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
a8d990ca14
commit
ac23dc3279
7 changed files with 12 additions and 11 deletions
|
|
@ -56,7 +56,7 @@
|
|||
}
|
||||
%enddef
|
||||
|
||||
#ifdef SWIG_DIRECTOR_TYPEMAPS
|
||||
#if defined(SWIG_DIRECTOR_TYPEMAPS)
|
||||
/* directorout */
|
||||
|
||||
%define %ptr_directorout_typemap(asptr_meth,frag,Type...)
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@
|
|||
}
|
||||
|
||||
|
||||
#ifdef SWIG_DIRECTOR_TYPEMAPS
|
||||
#if defined(SWIG_DIRECTOR_TYPEMAPS)
|
||||
|
||||
/* directorin */
|
||||
|
||||
|
|
@ -157,7 +157,8 @@
|
|||
|
||||
/* directorout */
|
||||
|
||||
%typemap(directorout,noblock=1,fragment=#SWIG_AsCharPtr) Char * (Char* buf = 0, int alloc = 0) {
|
||||
%typemap(directorout,noblock=1,fragment=#SWIG_AsCharPtr)
|
||||
Char * (Char* buf = 0, int alloc = 0) {
|
||||
if (SWIG_AsCharPtr($input, &buf, &alloc) != SWIG_OK) {
|
||||
%dirout_fail(SWIG_TypeError, "$type");
|
||||
}
|
||||
|
|
@ -282,7 +283,7 @@
|
|||
}
|
||||
|
||||
|
||||
#ifdef SWIG_DIRECTOR_TYPEMAPS
|
||||
#if defined(SWIG_DIRECTOR_TYPEMAPS)
|
||||
|
||||
/* directorin */
|
||||
%typemap(directorin,fragment=#SWIG_FromCharPtrAndSize)
|
||||
|
|
@ -346,7 +347,7 @@
|
|||
%set_output(SWIG_FromCharPtrAndSize($1, $1_dim0));
|
||||
}
|
||||
|
||||
#ifdef SWIG_DIRECTOR_TYPEMAPS
|
||||
#if defined(SWIG_DIRECTOR_TYPEMAPS)
|
||||
|
||||
%typemap(directorin,noblock=1,fragment=#SWIG_FromCharPtrAndSize)
|
||||
Char FIXSIZE[ANY], const Char FIXSIZE[ANY]
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
%set_constant("$symname", $value);
|
||||
}
|
||||
|
||||
#ifdef SWIG_DIRECTOR_TYPEMAPS
|
||||
#if defined(SWIG_DIRECTOR_TYPEMAPS)
|
||||
|
||||
%typemap(directorin) SWIG_Object "$input = $1_name";
|
||||
%typemap(directorout) SWIG_Object "$result = $input;";
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@
|
|||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
|
||||
#ifdef SWIG_DIRECTOR_TYPEMAPS
|
||||
#if defined(SWIG_DIRECTOR_TYPEMAPS)
|
||||
|
||||
/* directorin */
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
|
||||
/*==== director output exception ====*/
|
||||
|
||||
#ifdef SWIG_DIRECTOR_TYPEMAPS
|
||||
#if defined(SWIG_DIRECTOR_TYPEMAPS)
|
||||
#ifndef SWIG_DirOutFail
|
||||
#define SWIG_DirOutFail(code, msg) Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(code), msg)
|
||||
#endif
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
#define %variable_fail(code, type, name) %error_block(SWIG_Error(code, %varfail_fmt(type, name)); SWIG_fail)
|
||||
#define %variable_nullref(type, name) %error_block(SWIG_Error(SWIG_ValueError, %varnullref_fmt(type, name)); SWIG_fail)
|
||||
|
||||
#ifdef SWIG_DIRECTOR_TYPEMAPS
|
||||
#if defined(SWIG_DIRECTOR_TYPEMAPS)
|
||||
#define %dirout_fail(code, type) SWIG_DirOutFail(code, %outfail_fmt(type))
|
||||
#define %dirout_nullref(type) SWIG_DirOutFail(SWIG_ValueError, %outnullref_fmt(type))
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
%enddef
|
||||
|
||||
|
||||
#ifdef SWIG_DIRECTOR_TYPEMAPS
|
||||
#if defined(SWIG_DIRECTOR_TYPEMAPS)
|
||||
|
||||
/* directorin */
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
$1 = (SWIG_ConvertPtr($input, &ptr, 0, 0) == SWIG_OK);
|
||||
}
|
||||
|
||||
#ifdef SWIG_DIRECTOR_TYPEMAPS
|
||||
#if defined(SWIG_DIRECTOR_TYPEMAPS)
|
||||
|
||||
/* directorout */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue