diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2017-01-24 19:04:35 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2017-01-24 19:04:35 +0000 |
| commit | 2abdb50f60b4390acc2263af385b72290c5b31ea (patch) | |
| tree | 6aaf762aa81ef722ea0b9d8784173ff1e527e3e9 /Source | |
| parent | d6d7afb75529f95edee21422a9dba07465b34266 (diff) | |
| parent | 519f296579f4a781352fe8c8f1d9ec0ef9559096 (diff) | |
| download | swig-2abdb50f60b4390acc2263af385b72290c5b31ea.tar.gz | |
Merge branch 'andrey-starodubtsev-directorargout_and_java_typemaps'
* andrey-starodubtsev-directorargout_and_java_typemaps:
WIP: #704 (java directorargout + java/typemaps.i fixes)
WIP: #704 (java directorargout + java/typemaps.i fixes)
WIP: #704 (java directorargout + java/typemaps.i fixes)
WIP: #704 (java directorargout + java/typemaps.i fixes)
WIP: #704 (java directorargout + java/typemaps.i fixes)
a lot of memory leak (local refs) fixed
java directorargout + java/typemaps.i fixes
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Modules/java.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 9808476eb..946962447 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -4399,7 +4399,7 @@ public: for (p = l; p;) { if ((tm = Getattr(p, "tmap:directorargout"))) { addThrows(n, "tmap:directorargout", p); - Replaceall(tm, "$result", "jresult"); + Replaceall(tm, "$result", makeParameterName(n, p, i, false)); Replaceall(tm, "$input", Getattr(p, "emit:directorinput")); Printv(w->code, tm, "\n", NIL); p = Getattr(p, "tmap:directorargout:next"); |