Merge branch 'imfunc'
* imfunc: Add special variable imfuncname expansion for C# and D Test and document imfuncname special variable expansion Update docs. Also expose in proxyClassFunctionHandler Expose to javaout typemaps. Conflicts: CHANGES.current
This commit is contained in:
commit
34c219b5f7
11 changed files with 117 additions and 0 deletions
|
|
@ -2691,6 +2691,7 @@ public:
|
|||
Replaceall(imcall, "$imfuncname", intermediary_function_name);
|
||||
}
|
||||
|
||||
Replaceall(tm, "$imfuncname", intermediary_function_name);
|
||||
Replaceall(tm, "$jnicall", imcall);
|
||||
} else {
|
||||
Swig_warning(WARN_JAVA_TYPEMAP_JAVAOUT_UNDEF, input_file, line_number, "No javaout typemap defined for %s\n", SwigType_str(t, 0));
|
||||
|
|
@ -3176,6 +3177,7 @@ public:
|
|||
else
|
||||
Replaceall(tm, "$owner", "false");
|
||||
substituteClassname(t, tm);
|
||||
Replaceall(tm, "$imfuncname", overloaded_name);
|
||||
Replaceall(tm, "$jnicall", imcall);
|
||||
} else {
|
||||
Swig_warning(WARN_JAVA_TYPEMAP_JAVAOUT_UNDEF, input_file, line_number, "No javaout typemap defined for %s\n", SwigType_str(t, 0));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue