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

Merge branch 'tobilau-localref_wstring'

Browse source 
* tobilau-localref_wstring:
  Added LocalRefGuard for wstrings
This commit is contained in:
William S Fulton 2016-10-30 13:55:34 +00:00
commit b8ec248494
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/java/std_wstring.i
View file

@ -59,15 +59,16 @@ class wstring;
jenv->ReleaseStringChars($input, $1_pstr); jenv->ReleaseStringChars($input, $1_pstr);
%} %}
%typemap(directorin,descriptor="Ljava/lang/String;") wstring { %typemap(directorin,descriptor="Ljava/lang/String;") wstring %{
jsize $1_len = $1.length(); jsize $1_len = $1.length();
jchar *conv_buf = new jchar[$1_len]; jchar *$1_conv_buf = new jchar[$1_len];
for (jsize i = 0; i < $1_len; ++i) { for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = (jchar)$1[i]; $1_conv_buf[i] = (jchar)$1[i];
} }
$input = jenv->NewString(conv_buf, $1_len); $input = jenv->NewString($1_conv_buf, $1_len);
delete [] conv_buf; Swig::LocalRefGuard $1_refguard(jenv, $input);
} delete [] $1_conv_buf;
%}
%typemap(out) wstring %typemap(out) wstring
%{jsize $1_len = $1.length(); %{jsize $1_len = $1.length();
@ -136,15 +137,16 @@ class wstring;
$result = &$1_str; $result = &$1_str;
jenv->ReleaseStringChars($input, $1_pstr); %} jenv->ReleaseStringChars($input, $1_pstr); %}
%typemap(directorin,descriptor="Ljava/lang/String;") const wstring & { %typemap(directorin,descriptor="Ljava/lang/String;") const wstring & %{
jsize $1_len = $1.length(); jsize $1_len = $1.length();
jchar *conv_buf = new jchar[$1_len]; jchar *$1_conv_buf = new jchar[$1_len];
for (jsize i = 0; i < $1_len; ++i) { for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = (jchar)($1)[i]; $1_conv_buf[i] = (jchar)($1)[i];
} }
$input = jenv->NewString(conv_buf, $1_len); $input = jenv->NewString($1_conv_buf, $1_len);
delete [] conv_buf; Swig::LocalRefGuard $1_refguard(jenv, $input);
} delete [] $1_conv_buf;
%}
%typemap(out) const wstring & %typemap(out) const wstring &
%{jsize $1_len = $1->length(); %{jsize $1_len = $1->length();