diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2006-10-20 22:54:14 +0000 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2006-10-20 22:54:14 +0000 |
commit | 24af2d1b1138cdd4947531b2278f3f15d0f53858 (patch) | |
tree | f73a380c1c3b687bdd2617ffdc45b004ca97b9b7 | |
parent | 4f85aa29decc44e2cd4ec1ebc755679f21680a4e (diff) | |
download | swig-24af2d1b1138cdd4947531b2278f3f15d0f53858.tar.gz |
consistent directout typemaps for all languages - $result used instead of $1 in C# and Java now
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9467 626c5289-ae23-0410-ae9c-e8d60b6d4f22
-rw-r--r-- | Lib/csharp/csharp.swg | 18 | ||||
-rw-r--r-- | Lib/csharp/enums.swg | 4 | ||||
-rw-r--r-- | Lib/csharp/enumsimple.swg | 4 | ||||
-rw-r--r-- | Lib/csharp/enumtypesafe.swg | 4 | ||||
-rw-r--r-- | Lib/csharp/std_string.i | 4 | ||||
-rw-r--r-- | Lib/csharp/typemaps.i | 3 | ||||
-rw-r--r-- | Lib/java/enums.swg | 4 | ||||
-rw-r--r-- | Lib/java/enumsimple.swg | 4 | ||||
-rw-r--r-- | Lib/java/enumtypesafe.swg | 4 | ||||
-rw-r--r-- | Lib/java/enumtypeunsafe.swg | 4 | ||||
-rw-r--r-- | Lib/java/java.swg | 30 | ||||
-rw-r--r-- | Lib/java/std_string.i | 4 | ||||
-rw-r--r-- | Lib/java/std_wstring.i | 4 | ||||
-rw-r--r-- | Lib/java/typemaps.i | 3 |
14 files changed, 46 insertions, 48 deletions
diff --git a/Lib/csharp/csharp.swg b/Lib/csharp/csharp.swg index e3746b160..a3d3fe4db 100644 --- a/Lib/csharp/csharp.swg +++ b/Lib/csharp/csharp.swg @@ -96,7 +96,7 @@ %{ $1 = $input ? true : false; %} %typemap(directorout) bool -%{ $1 = $input ? true : false; %} +%{ $result = $input ? true : false; %} %typemap(csdirectorin) bool "$iminput" %typemap(csdirectorout) bool "$cscall" @@ -129,7 +129,7 @@ unsigned long long, float, double -%{ $1 = ($1_ltype)$input; %} +%{ $result = ($1_ltype)$input; %} %typemap(directorin) bool "$input = $1;" %typemap(directorin) char "$input = $1;" @@ -194,7 +194,7 @@ /* char * - treat as String */ %typemap(in) char * %{ $1 = ($1_ltype)$input; %} %typemap(out) char * %{ $result = SWIG_csharp_string_callback((const char *)$1); %} -%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) char * %{ $1 = ($1_ltype)$input; %} +%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) char * %{ $result = ($1_ltype)$input; %} %typemap(directorin) char * %{ $input = SWIG_csharp_string_callback((const char *)$1); %} %typemap(csdirectorin) char * "$iminput" %typemap(csdirectorout) char * "$cscall" @@ -212,7 +212,7 @@ %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const bool & %{ static $*1_ltype temp; temp = $input ? true : false; - $1 = &temp; %} + $result = &temp; %} %typemap(csdirectorin) const bool & "$iminput" %typemap(csdirectorout) const bool & "$cscall" @@ -247,7 +247,7 @@ const double & %{ static $*1_ltype temp; temp = ($*1_ltype)$input; - $1 = &temp; %} + $result = &temp; %} %typemap(directorin) const bool & "$input = $1_name;" %typemap(directorin) const char & "$input = $1_name;" @@ -321,7 +321,7 @@ SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Unexpected null return for type $1_type", 0); return $null; } - $1 = *($&1_ltype)$input; %} + $result = *($&1_ltype)$input; %} %typemap(out) SWIGTYPE #ifdef __cplusplus @@ -350,7 +350,7 @@ %typemap(out) SWIGTYPE *, SWIGTYPE & %{ $result = (void *)$1; %} %typemap(out) SWIGTYPE (CLASS::*) %{ $result = (void *)&$1; %} %typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE *, SWIGTYPE (CLASS::*) -%{ $1 = ($1_ltype)$input; %} +%{ $result = ($1_ltype)$input; %} %typemap(directorin) SWIGTYPE *, SWIGTYPE (CLASS::*) %{ $input = (void *) $1; %} @@ -359,7 +359,7 @@ SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Unexpected null return for type $1_type", 0); return $null; } - $1 = ($1_ltype)$input; %} + $result = ($1_ltype)$input; %} %typemap(directorin) SWIGTYPE & %{ $input = ($1_ltype) &$1; %} @@ -374,7 +374,7 @@ %typemap(in) char[ANY], char[] %{ $1 = ($1_ltype)$input; %} %typemap(out) char[ANY], char[] %{ $result = SWIG_csharp_string_callback((const char *)$1); %} -%typemap(directorout) char[ANY], char[] %{ $1 = ($1_ltype)$input; %} +%typemap(directorout) char[ANY], char[] %{ $result = ($1_ltype)$input; %} %typemap(directorin) char[ANY], char[] %{ $input = SWIG_csharp_string_callback((const char *)$1); %} %typemap(csdirectorin) char[ANY], char[] "$iminput" diff --git a/Lib/csharp/enums.swg b/Lib/csharp/enums.swg index d2362ef48..be2a6063b 100644 --- a/Lib/csharp/enums.swg +++ b/Lib/csharp/enums.swg @@ -20,7 +20,7 @@ %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %{ static $*1_ltype temp = ($*1_ltype)$input; - $1 = &temp; %} + $result = &temp; %} %typemap(directorin) const enum SWIGTYPE & "$input = $1_name;" %typemap(csdirectorin) const enum SWIGTYPE & "($*csclassname)$iminput" %typemap(csdirectorout) const enum SWIGTYPE & "(int)$cscall" @@ -53,7 +53,7 @@ %typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} %typemap(out) enum SWIGTYPE %{ $result = $1; %} -%typemap(directorout) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} +%typemap(directorout) enum SWIGTYPE %{ $result = ($1_ltype)$input; %} %typemap(directorin) enum SWIGTYPE "$input = $1;" %typemap(csdirectorin) enum SWIGTYPE "($csclassname)$iminput" %typemap(csdirectorout) enum SWIGTYPE "(int)$cscall" diff --git a/Lib/csharp/enumsimple.swg b/Lib/csharp/enumsimple.swg index 43f1c4607..f50849892 100644 --- a/Lib/csharp/enumsimple.swg +++ b/Lib/csharp/enumsimple.swg @@ -22,7 +22,7 @@ %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %{ static $*1_ltype temp = ($*1_ltype)$input; - $1 = &temp; %} + $result = &temp; %} %typemap(directorin) const enum SWIGTYPE & "$input = $1_name;" %typemap(csdirectorin) const enum SWIGTYPE & "$iminput" %typemap(csdirectorout) const enum SWIGTYPE & "$cscall" @@ -55,7 +55,7 @@ %typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} %typemap(out) enum SWIGTYPE %{ $result = $1; %} -%typemap(directorout) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} +%typemap(directorout) enum SWIGTYPE %{ $result = ($1_ltype)$input; %} %typemap(directorin) enum SWIGTYPE "$input = $1;" %typemap(csdirectorin) enum SWIGTYPE "$iminput" %typemap(csdirectorout) enum SWIGTYPE "$cscall" diff --git a/Lib/csharp/enumtypesafe.swg b/Lib/csharp/enumtypesafe.swg index 9822ad27d..8ba7838ef 100644 --- a/Lib/csharp/enumtypesafe.swg +++ b/Lib/csharp/enumtypesafe.swg @@ -21,7 +21,7 @@ %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %{ static $*1_ltype temp = ($*1_ltype)$input; - $1 = &temp; %} + $result = &temp; %} %typemap(directorin) const enum SWIGTYPE & "$input = $1_name;" %typemap(csdirectorin) const enum SWIGTYPE & "$*csclassname.swigToEnum($iminput)" %typemap(csdirectorout) const enum SWIGTYPE & "$cscall.swigValue" @@ -54,7 +54,7 @@ %typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} %typemap(out) enum SWIGTYPE %{ $result = $1; %} -%typemap(directorout) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} +%typemap(directorout) enum SWIGTYPE %{ $result = ($1_ltype)$input; %} %typemap(directorin) enum SWIGTYPE "$input = $1;" %typemap(csdirectorin) enum SWIGTYPE "$csclassname.swigToEnum($iminput)" %typemap(csdirectorout) enum SWIGTYPE "$cscall.swigValue" diff --git a/Lib/csharp/std_string.i b/Lib/csharp/std_string.i index c029f1693..6642c8d2b 100644 --- a/Lib/csharp/std_string.i +++ b/Lib/csharp/std_string.i @@ -42,7 +42,7 @@ class string; SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0); return $null; } - $1 = std::string($input); %} + $result = std::string($input); %} %typemap(directorin) string %{ $input = SWIG_csharp_string_callback($1.c_str()); %} @@ -97,7 +97,7 @@ class string; } /* possible thread/reentrant code problem */ static std::string $1_str($input); - $1 = &$1_str; %} + $result = &$1_str; %} %typemap(directorin) const string & %{ $input = SWIG_csharp_string_callback($1.c_str()); %} diff --git a/Lib/csharp/typemaps.i b/Lib/csharp/typemaps.i index 7268188b9..ddfbd1b0c 100644 --- a/Lib/csharp/typemaps.i +++ b/Lib/csharp/typemaps.i @@ -69,7 +69,7 @@ In C# you could then use it like this: %{ $1 = ($1_ltype)&$input; %} %typemap(directorout) TYPE *INPUT, TYPE &INPUT -%{ $1 = ($1_ltype)&$input; %} +%{ $result = ($1_ltype)&$input; %} %typemap(directorin) TYPE &INPUT %{ $input = (CTYPE *)$1; %} @@ -260,7 +260,6 @@ of the function return value. %{ $1 = ($1_ltype)$input; %} %typemap(directorout,warning="Need to provide TYPE *INOUT directorout typemap") TYPE *INOUT, TYPE &INOUT { - } %typemap(directorin) TYPE &INOUT diff --git a/Lib/java/enums.swg b/Lib/java/enums.swg index 8edd3a8bd..2ccb95403 100644 --- a/Lib/java/enums.swg +++ b/Lib/java/enums.swg @@ -22,7 +22,7 @@ %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %{ static $*1_ltype temp = ($*1_ltype)$input; - $1 = &temp; %} + $result = &temp; %} %typemap(directorin, descriptor="L$packagepath/$*javaclassname;") const enum SWIGTYPE & "$input = (jint)$1_name;" %typemap(javadirectorin) const enum SWIGTYPE & "$*javaclassname.swigToEnum($jniinput)" %typemap(javadirectorout) const enum SWIGTYPE & "($javacall).swigValue()" @@ -47,7 +47,7 @@ %typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} %typemap(out) enum SWIGTYPE %{ $result = (jint)$1; %} -%typemap(directorout) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} +%typemap(directorout) enum SWIGTYPE %{ $result = ($1_ltype)$input; %} %typemap(directorin, descriptor="L$packagepath/$javaclassname;") enum SWIGTYPE "$input = (jint) $1;" %typemap(javadirectorin) enum SWIGTYPE "$javaclassname.swigToEnum($jniinput)" %typemap(javadirectorout) enum SWIGTYPE "($javacall).swigValue()" diff --git a/Lib/java/enumsimple.swg b/Lib/java/enumsimple.swg index deb8b8f11..f45774d0c 100644 --- a/Lib/java/enumsimple.swg +++ b/Lib/java/enumsimple.swg @@ -22,7 +22,7 @@ %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %{ static $*1_ltype temp = ($*1_ltype)$input; - $1 = &temp; %} + $result = &temp; %} %typemap(directorin, descriptor="I") const enum SWIGTYPE & "$input = (jint)$1_name;" %typemap(javadirectorin) const enum SWIGTYPE & "$jniinput" %typemap(javadirectorout) const enum SWIGTYPE & "$javacall" @@ -47,7 +47,7 @@ %typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} %typemap(out) enum SWIGTYPE %{ $result = (jint)$1; %} -%typemap(directorout) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} +%typemap(directorout) enum SWIGTYPE %{ $result = ($1_ltype)$input; %} %typemap(directorin, descriptor="I") enum SWIGTYPE "$input = (jint) $1;" %typemap(javadirectorin) enum SWIGTYPE "$jniinput" %typemap(javadirectorout) enum SWIGTYPE "$javacall" diff --git a/Lib/java/enumtypesafe.swg b/Lib/java/enumtypesafe.swg index e2af7ee6b..a49a9d134 100644 --- a/Lib/java/enumtypesafe.swg +++ b/Lib/java/enumtypesafe.swg @@ -21,7 +21,7 @@ %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %{ static $*1_ltype temp = ($*1_ltype)$input; - $1 = &temp; %} + $result = &temp; %} %typemap(directorin, descriptor="L$packagepath/$*javaclassname;") const enum SWIGTYPE & "$input = (jint)$1_name;" %typemap(javadirectorin) const enum SWIGTYPE & "$*javaclassname.swigToEnum($jniinput)" %typemap(javadirectorout) const enum SWIGTYPE & "($javacall).swigValue()" @@ -45,7 +45,7 @@ %typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} %typemap(out) enum SWIGTYPE %{ $result = (jint)$1; %} -%typemap(directorout) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} +%typemap(directorout) enum SWIGTYPE %{ $result = ($1_ltype)$input; %} %typemap(directorin, descriptor="L$packagepath/$javaclassname;") enum SWIGTYPE "$input = (jint) $1;" %typemap(javadirectorin) enum SWIGTYPE "$javaclassname.swigToEnum($jniinput)" %typemap(javadirectorout) enum SWIGTYPE "($javacall).swigValue()" diff --git a/Lib/java/enumtypeunsafe.swg b/Lib/java/enumtypeunsafe.swg index fc32932e4..bda055113 100644 --- a/Lib/java/enumtypeunsafe.swg +++ b/Lib/java/enumtypeunsafe.swg @@ -22,7 +22,7 @@ %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %{ static $*1_ltype temp = ($*1_ltype)$input; - $1 = &temp; %} + $result = &temp; %} %typemap(directorin, descriptor="I") const enum SWIGTYPE & "$input = (jint)$1_name;" %typemap(javadirectorin) const enum SWIGTYPE & "$jniinput" %typemap(javadirectorout) const enum SWIGTYPE & "$javacall" @@ -47,7 +47,7 @@ %typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} %typemap(out) enum SWIGTYPE %{ $result = (jint)$1; %} -%typemap(directorout) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %} +%typemap(directorout) enum SWIGTYPE %{ $result = ($1_ltype)$input; %} %typemap(directorin, descriptor="I") enum SWIGTYPE "$input = (jint) $1;" %typemap(javadirectorin) enum SWIGTYPE "$jniinput" %typemap(javadirectorout) enum SWIGTYPE "$javacall" diff --git a/Lib/java/java.swg b/Lib/java/java.swg index af76e11b4..d743e026f 100644 --- a/Lib/java/java.swg +++ b/Lib/java/java.swg @@ -157,7 +157,7 @@ %{ $1 = $input ? true : false; %} %typemap(directorout) bool -%{ $1 = $input ? true : false; %} +%{ $result = $input ? true : false; %} %typemap(javadirectorin) bool "$jniinput" %typemap(javadirectorout) bool "$javacall" @@ -188,7 +188,7 @@ long long, float, double -%{ $1 = ($1_ltype)$input; %} +%{ $result = ($1_ltype)$input; %} %typemap(directorin, descriptor="Z") bool "$input = (jboolean) $1;" %typemap(directorin, descriptor="C") char "$input = (jint) $1;" @@ -289,9 +289,9 @@ ba = (jbyteArray)JCALL2(CallObjectMethod, jenv, $input, mid); bae = JCALL2(GetByteArrayElements, jenv, ba, 0); sz = JCALL1(GetArrayLength, jenv, ba); - $1 = 0; + $result = 0; for(i=0; i<sz; i++) { - $1 = ($1 << 8) | ($1_type)(unsigned char)bae[i]; + $result = ($result << 8) | ($1_type)(unsigned char)bae[i]; } JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0); } @@ -350,8 +350,8 @@ %typemap(directorout, noblock=1, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) char * { $1 = 0; if ($input) { - $1 = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0); - if (!$1) return $null; + $result = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0); + if (!$result) return $null; } } @@ -381,7 +381,7 @@ %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const bool & %{ static $*1_ltype temp; temp = $input ? true : false; - $1 = &temp; %} + $result = &temp; %} %typemap(javadirectorin) const bool & "$jniinput" %typemap(javadirectorout) const bool & "$javacall" @@ -415,7 +415,7 @@ const double & %{ static $*1_ltype temp; temp = ($*1_ltype)$input; - $1 = &temp; %} + $result = &temp; %} %typemap(directorin, descriptor="Z") const bool & "$input = (jboolean)$1_name;" %typemap(directorin, descriptor="C") const char & "$input = (jchar)$1_name;" @@ -519,7 +519,7 @@ ba = (jbyteArray)JCALL2(CallObjectMethod, jenv, $input, mid); bae = JCALL2(GetByteArrayElements, jenv, ba, 0); sz = JCALL1(GetArrayLength, jenv, ba); - $1 = &temp; + $result = &temp; temp = 0; for(i=0; i<sz; i++) { temp = (temp << 8) | ($*1_ltype)(unsigned char)bae[i]; @@ -563,7 +563,7 @@ SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Unexpected null return for type $1_type"); return $null; } - $1 = *argp; %} + $result = *argp; %} %typemap(out) SWIGTYPE #ifdef __cplusplus @@ -595,7 +595,7 @@ %{ *($&1_ltype)&$result = $1; %} %typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE *, SWIGTYPE (CLASS::*) -%{ $1 = *($&1_ltype)&$input; %} +%{ $result = *($&1_ltype)&$input; %} %typemap(directorin,descriptor="L$packagepath/$javaclassname;") SWIGTYPE *, SWIGTYPE (CLASS::*) %{ *(($&1_ltype)&$input) = ($1_ltype) $1; %} @@ -604,7 +604,7 @@ SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Unexpected null return for type $1_type"); return $null; } - $1 = *($&1_ltype)&$input; %} + $result = *($&1_ltype)&$input; %} %typemap(directorin,descriptor="L$packagepath/$javaclassname;") SWIGTYPE & %{ *($&1_ltype)&$input = ($1_ltype) &$1; %} @@ -628,8 +628,8 @@ %typemap(directorout, noblock=1) char[ANY], char[] { $1 = 0; if ($input) { - $1 = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0); - if (!$1) return $null; + $result = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0); + if (!$result) return $null; } } @@ -688,7 +688,7 @@ jfloatArray, jdoubleArray, jobjectArray -%{ $1 = $input; %} +%{ $result = $input; %} %typemap(out) jboolean, jchar, diff --git a/Lib/java/std_string.i b/Lib/java/std_string.i index d1f1ad700..83f67b29c 100644 --- a/Lib/java/std_string.i +++ b/Lib/java/std_string.i @@ -46,7 +46,7 @@ class string; } const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); if (!$1_pstr) return $null; - $1 = std::string($1_pstr); + $result = std::string($1_pstr); jenv->ReleaseStringUTFChars($input, $1_pstr); %} %typemap(directorin,descriptor="Ljava/lang/String;") string @@ -94,7 +94,7 @@ class string; if (!$1_pstr) return $null; /* possible thread/reentrant code problem */ static std::string $1_str($1_pstr); - $1 = &$1_str; + $result = &$1_str; jenv->ReleaseStringUTFChars($input, $1_pstr); %} %typemap(directorin,descriptor="Ljava/lang/String;") const string & diff --git a/Lib/java/std_wstring.i b/Lib/java/std_wstring.i index 0e0d664dc..d38a62c29 100644 --- a/Lib/java/std_wstring.i +++ b/Lib/java/std_wstring.i @@ -60,7 +60,7 @@ class wstring; for (jsize i = 0; i < $1_len; ++i) { conv_buf[i] = $1_pstr[i]; } - $1 = std::wstring(conv_buf, $1_len); + $result = std::wstring(conv_buf, $1_len); delete [] conv_buf; } jenv->ReleaseStringChars($input, $1_pstr); @@ -136,7 +136,7 @@ class wstring; $1_str = std::wstring(conv_buf, $1_len); delete [] conv_buf; } - $1 = &$1_str; + $result = &$1_str; jenv->ReleaseStringChars($input, $1_pstr); %} %typemap(directorin,descriptor="Ljava/lang/String;") const wstring & { diff --git a/Lib/java/typemaps.i b/Lib/java/typemaps.i index 2b5f49c97..497cd64f7 100644 --- a/Lib/java/typemaps.i +++ b/Lib/java/typemaps.i @@ -75,7 +75,7 @@ There are no char *INPUT typemaps, however you can apply the signed char * typem %typemap(freearg) TYPE *INPUT, TYPE &INPUT "" %typemap(directorout) TYPE *INPUT, TYPE &INPUT -%{ $1 = ($1_ltype)&$input; %} +%{ $result = ($1_ltype)&$input; %} %typemap(directorin,descriptor=JNIDESC) TYPE &INPUT %{ *(($&1_ltype) $input) = (JNITYPE *) &$1; %} @@ -359,7 +359,6 @@ There are no char *INOUT typemaps, however you can apply the signed char * typem { JCALL3(Release##JAVATYPE##ArrayElements, jenv, $input, (JNITYPE *)$1, 0); } %typemap(directorout,warning="Need to provide TYPE *INOUT directorout typemap") TYPE *INOUT, TYPE &INOUT { - } %typemap(directorin,descriptor=JNIDESC) TYPE &INOUT |