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

interface macro changes to support templates

Browse source 
The C++ type must be last in the argument list to support templates with
multiple arguments which are separated by commas.
Affects DECLARE_INTERFACE and DECLARE_INTERFACE_RENAME.
This commit is contained in:
William S Fulton 2016-02-09 07:02:42 +00:00
commit f82efac231
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/java/feature_interface.i
View file

@ -1,4 +1,4 @@
%define DECLARE_INTERFACE_(CTYPE, INTERFACE, IMPL)
%define DECLARE_INTERFACE_(INTERFACE, IMPL, CTYPE...)
%feature("interface", name = "INTERFACE", cptr = #INTERFACE ## "_SWIGInterfaceUpcast") CTYPE;
%typemap(jtype, nopgcpp="1") CTYPE, CTYPE *, CTYPE *const&, CTYPE [], CTYPE & "long"
%typemap(jstype) CTYPE, CTYPE *, CTYPE *const&, CTYPE [], CTYPE & "INTERFACE"
@ -20,12 +20,12 @@
SWIG_JAVABODY_PROXY(public, protected, CTYPE)
%enddef
%define DECLARE_INTERFACE_RENAME(CTYPE, INTERFACE, IMPL)
%define DECLARE_INTERFACE_RENAME(INTERFACE, IMPL, CTYPE...)
%rename (IMPL) CTYPE;
DECLARE_INTERFACE_(CTYPE, INTERFACE, IMPL)
DECLARE_INTERFACE_(INTERFACE, IMPL, CTYPE)
%enddef
%define DECLARE_INTERFACE(CTYPE, INTERFACE)
DECLARE_INTERFACE_(CTYPE, INTERFACE, CTYPE)
%define DECLARE_INTERFACE(INTERFACE, CTYPE...)
DECLARE_INTERFACE_(INTERFACE, CTYPE, CTYPE)
%enddef