summaryrefslogtreecommitdiff
path: root/Examples
diff options
context:
space:
mode:
authorThomas Reitmayr <treitmayr@devbase.at>2020-06-14 14:46:03 +0200
committerThomas Reitmayr <treitmayr@devbase.at>2020-06-20 12:14:42 +0200
commitc2597023149353cf67797fbb55ba75b861eca85f (patch)
tree4dc90d5bb85b6dfde3aeee0bf759589f746a3555 /Examples
parent09a5b83aac43bd390c1168a8a33522ce3c5146a8 (diff)
downloadswig-c2597023149353cf67797fbb55ba75b861eca85f.tar.gz
Perform proper spacing in director method declarations
If a director method returns a const pointer, eg. 'int *const', then in its method declaration a space has to be inserted between 'const' and the method name. This fixes swig#1810.
Diffstat (limited to 'Examples')
-rw-r--r--Examples/test-suite/director_basic.i17
-rw-r--r--Examples/test-suite/javascript/Makefile.in1
2 files changed, 16 insertions, 2 deletions
diff --git a/Examples/test-suite/director_basic.i b/Examples/test-suite/director_basic.i
index 07d627589..23d910324 100644
--- a/Examples/test-suite/director_basic.i
+++ b/Examples/test-suite/director_basic.i
@@ -5,6 +5,7 @@
#endif
%warnfilter(SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR) MyClass::pmethod;
+%warnfilter(SWIGWARN_TYPEMAP_DIRECTOROUT_PTR) ConstPtrClass::getConstPtr;
%{
#include <string>
@@ -174,7 +175,19 @@ public:
}
};
-
-%}
+ %}
%template(MyClassT_i) MyClassT<int>;
+
+ %feature("director") ConstPtrClass;
+
+ %inline %{
+
+class ConstPtrClass {
+public:
+ virtual ~ConstPtrClass() {}
+ virtual int *const getConstPtr() = 0;
+};
+
+ %}
+
diff --git a/Examples/test-suite/javascript/Makefile.in b/Examples/test-suite/javascript/Makefile.in
index 8127415f1..4dc02e3bf 100644
--- a/Examples/test-suite/javascript/Makefile.in
+++ b/Examples/test-suite/javascript/Makefile.in
@@ -52,6 +52,7 @@ ifeq (node,$(JSENGINE))
apply_signed_char.cpptest: GYP_CFLAGS = \"-Wno-ignored-qualifiers\"
constant_pointers.cpptest: GYP_CFLAGS = \"-Wno-ignored-qualifiers\"
enum_thorough.cpptest: GYP_CFLAGS = \"-Wno-ignored-qualifiers\"
+ director_basic.cpptest: GYP_CFLAGS = \"-Wno-ignored-qualifiers\"
setup_node = \
test -d $* || mkdir $* && \