Add missing VOID_INT_PTR director typemaps

Examples/test-suite/common.mk

@@ -203,6 +203,7 @@ CPP_TEST_CASES += \
 	director_thread \
 	director_unroll \
 	director_using \
+	director_void \
 	director_wombat \
 	disown \
 	dynamic_cast \

Examples/test-suite/csharp/director_void_runme.cs

@@ -0,0 +1,83 @@
+using System;
+using director_voidNamespace;
+
+public class runme
+{
+  private static void WaitForGC()
+  {
+    System.GC.Collect();
+    System.GC.WaitForPendingFinalizers();
+    System.Threading.Thread.Sleep(10);
+  }
+
+  static void Main()
+  {
+    runme r = new runme();
+    r.run();
+  }
+
+  void run()
+  {
+    Caller caller = new Caller();
+    {
+      DirectorVoidPointer dvp = new DirectorVoidPointer(5);
+      int x = caller.callVirtualIn(dvp, 6);
+      if (x != 106)
+        throw new Exception("Fail1 should be 106, got " + x);
+      global::System.IntPtr ptr = dvp.nonVirtualVoidPtrOut();
+      x = Caller.VoidToInt(ptr);
+      if (x != 106)
+        throw new Exception("Fail2 should be 106, got " + x);
+      x = Caller.VoidToInt(dvp.voidPtrOut());
+      if (x != 106)
+        throw new Exception("Fail3 should be 106, got " + x);
+    }
+
+    {
+      DirectorVoidPointer dvp = new director_void_VoidPointer(5);
+      int x = caller.callVirtualIn(dvp, 6);
+      if (x != 12)
+        throw new Exception("Fail1 should be 12, got " + x);
+      global::System.IntPtr ptr = dvp.nonVirtualVoidPtrOut();
+      x = Caller.VoidToInt(ptr);
+      if (x != 25)
+        throw new Exception("Fail2 should be 25, got " + x);
+      x = Caller.VoidToInt(dvp.voidPtrOut());
+      if (x != 1234)
+        throw new Exception("Fail3 should be 1234, got " + x);
+    }
+
+    {
+      DirectorVoidPointer dvp = new DirectorVoidPointer(10);
+      int x = caller.callVirtualOut(dvp);
+      if (x != 10)
+        throw new Exception("Bad1 should be 10, got " + x);
+      global::System.IntPtr ptr = dvp.nonVirtualVoidPtrOut();
+      x = dvp.nonVirtualVoidPtrIn(ptr);
+      if (x != 110)
+        throw new Exception("Bad2 should be 110, got " + x);
+    }
+    {
+      DirectorVoidPointer dvp = new director_void_VoidPointer(10);
+      int x = caller.callVirtualOut(dvp);
+      if (x != 1234)
+        throw new Exception("Bad3 should be 1234, got " + x);
+      global::System.IntPtr ptr = dvp.nonVirtualVoidPtrOut();
+      x = dvp.nonVirtualVoidPtrIn(ptr);
+      if (x != 1334)
+        throw new Exception("Bad4 should be 1334, got " + x);
+    }
+  }
+}
+
+class director_void_VoidPointer : DirectorVoidPointer {
+  public director_void_VoidPointer(int num) : base(num*num) {
+  }
+  public override int voidPtrIn(global::System.IntPtr p) {
+    return Caller.VoidToInt(p) * 2;
+  }
+  public override global::System.IntPtr voidPtrOut() {
+    setNewValue(1234);
+    return nonVirtualVoidPtrOut();
+  }
+}

Examples/test-suite/director_void.i

@@ -0,0 +1,47 @@
+%module(directors="1") director_void
+
+%warnfilter(SWIGWARN_TYPEMAP_DIRECTOROUT_PTR) voidPtrOut;
+
+%feature("director") DirectorVoidPointer;
+
+#if defined(SWIGCSHARP)
+%apply void *VOID_INT_PTR { void * }
+#endif
+
+%inline %{
+class DirectorVoidPointer {
+  int *ptr;
+public:
+  DirectorVoidPointer(int val) : ptr(new int(val)) {}
+  virtual ~DirectorVoidPointer() { delete ptr; }
+
+  virtual void * voidPtrOut() { return ptr; }
+  virtual int voidPtrIn(void *p) {
+    return nonVirtualVoidPtrIn(p);
+  }
+
+  void setNewValue(int val) {
+    delete ptr;
+    ptr = new int(val);
+  }
+  void *nonVirtualVoidPtrOut() { return ptr; }
+  int nonVirtualVoidPtrIn(void *p) {
+    int val = *(int *)p;
+    setNewValue(val + 100);
+    return *ptr;
+  }
+};
+
+struct Caller {
+  int callVirtualIn(DirectorVoidPointer *d, int num) {
+    return d->voidPtrIn(&num);
+  }
+  int callVirtualOut(DirectorVoidPointer *d) {
+    return *(int *)d->voidPtrOut();
+  }
+  static int VoidToInt(void *p) {
+    return *(int *)p;
+  }
+};
+%}
+