diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2014-09-27 14:32:03 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2014-09-27 14:32:03 +0100 |
| commit | f4964f5fb3f26bbe8526adb2bf2efe7543c98732 (patch) | |
| tree | 689490a8313020603e9d40a0f9b51ce2c8da0226 /Lib/java | |
| parent | 2f5bf397ae5235129efed25cefbb8dbcb277eaf0 (diff) | |
| download | swig-f4964f5fb3f26bbe8526adb2bf2efe7543c98732.tar.gz | |
Use more conventional naming for generated Java LocalRefGuard variables
Diffstat (limited to 'Lib/java')
| -rw-r--r-- | Lib/java/java.swg | 7 | ||||
| -rw-r--r-- | Lib/java/std_string.i | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Lib/java/java.swg b/Lib/java/java.swg index 3ad0e7aba..98524e85e 100644 --- a/Lib/java/java.swg +++ b/Lib/java/java.swg @@ -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 * { - $input = 0; + $input = 0; if ($1) { $input = JCALL1(NewStringUTF, jenv, (const char *)$1); 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); } @@ -732,7 +733,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { $input = JCALL1(NewStringUTF, jenv, (const char *)$1); if (!$input) return $null; } - Swig::LocalRefGuard refGuard_$input(jenv, $input); + Swig::LocalRefGuard $1_refguard(jenv, $input); } %typemap(argout) char[ANY], char[] "" diff --git a/Lib/java/std_string.i b/Lib/java/std_string.i index 322d0da12..830a89611 100644 --- a/Lib/java/std_string.i +++ b/Lib/java/std_string.i @@ -50,7 +50,7 @@ class string; %typemap(directorin,descriptor="Ljava/lang/String;") string %{ $input = jenv->NewStringUTF($1.c_str()); - Swig::LocalRefGuard refGuard_$input(jenv, $input); %} + Swig::LocalRefGuard $1_refguard(jenv, $input); %} %typemap(out) string %{ $result = jenv->NewStringUTF($1.c_str()); %} @@ -100,7 +100,7 @@ class string; %typemap(directorin,descriptor="Ljava/lang/String;") const string & %{ $input = jenv->NewStringUTF($1.c_str()); - Swig::LocalRefGuard refGuard_$input(jenv, $input); %} + Swig::LocalRefGuard $1_refguard(jenv, $input); %} %typemap(out) const string & %{ $result = jenv->NewStringUTF($1->c_str()); %} |