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

Bug 1446319 - variable of same name emitted more than once when more than wstring parameter in director methods

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8996 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2006-03-10 21:47:58 +00:00
commit 0eaa9f70dd
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
SWIG/Lib/java/std_wstring.i
View file

@ -66,14 +66,15 @@ 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 *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]; conv_buf[i] = (jchar)$1[i];
} }
$input = jenv->NewString(conv_buf, $1_len); $input = jenv->NewString(conv_buf, $1_len);
delete [] conv_buf; %} delete [] conv_buf;
}
%typemap(out) wstring %typemap(out) wstring
%{jsize $1_len = $1.length(); %{jsize $1_len = $1.length();
@ -137,14 +138,15 @@ class wstring;
$1 = &$1_str; $1 = &$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 *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]; conv_buf[i] = (jchar)($1)[i];
} }
$input = jenv->NewString(conv_buf, $1_len); $input = jenv->NewString(conv_buf, $1_len);
delete [] conv_buf; %} delete [] conv_buf;
}
%typemap(out) const wstring & %typemap(out) const wstring &
%{jsize $1_len = $1->length(); %{jsize $1_len = $1->length();