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

Use more conventional naming for generated Java LocalRefGuard variables

Browse source
This commit is contained in:
William S Fulton 2014-09-27 14:32:03 +01:00
commit f4964f5fb3
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/java/java.swg
View file

@ -400,12 +400,13 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
} }
%typemap(directorin, descriptor="Ljava/lang/String;", noblock=1) char * { %typemap(directorin, descriptor="Ljava/lang/String;", noblock=1) char * {
$input = 0; $input = 0;
if ($1) { if ($1) {
$input = JCALL1(NewStringUTF, jenv, (const char *)$1); $input = JCALL1(NewStringUTF, jenv, (const char *)$1);
if (!$input) return $null; if (!$input) return $null;
} }
Swig::LocalRefGuard refGuard_$input(jenv, $input); Swig::LocalRefGuard $1_refguard(jenv, $input);
// boohoo
} }
%typemap(freearg, noblock=1) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); } %typemap(freearg, noblock=1) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); }
@ -732,7 +733,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
$input = JCALL1(NewStringUTF, jenv, (const char *)$1); $input = JCALL1(NewStringUTF, jenv, (const char *)$1);
if (!$input) return $null; if (!$input) return $null;
} }
Swig::LocalRefGuard refGuard_$input(jenv, $input); Swig::LocalRefGuard $1_refguard(jenv, $input);
} }
%typemap(argout) char[ANY], char[] "" %typemap(argout) char[ANY], char[] ""

4
Lib/java/std_string.i
View file

@ -50,7 +50,7 @@ class string;
%typemap(directorin,descriptor="Ljava/lang/String;") string %typemap(directorin,descriptor="Ljava/lang/String;") string
%{ $input = jenv->NewStringUTF($1.c_str()); %{ $input = jenv->NewStringUTF($1.c_str());
Swig::LocalRefGuard refGuard_$input(jenv, $input); %} Swig::LocalRefGuard $1_refguard(jenv, $input); %}
%typemap(out) string %typemap(out) string
%{ $result = jenv->NewStringUTF($1.c_str()); %} %{ $result = jenv->NewStringUTF($1.c_str()); %}
@ -100,7 +100,7 @@ class string;
%typemap(directorin,descriptor="Ljava/lang/String;") const string & %typemap(directorin,descriptor="Ljava/lang/String;") const string &
%{ $input = jenv->NewStringUTF($1.c_str()); %{ $input = jenv->NewStringUTF($1.c_str());
Swig::LocalRefGuard refGuard_$input(jenv, $input); %} Swig::LocalRefGuard $1_refguard(jenv, $input); %}
%typemap(out) const string & %typemap(out) const string &
%{ $result = jenv->NewStringUTF($1->c_str()); %} %{ $result = jenv->NewStringUTF($1->c_str()); %}