Apply patch SF #335 - Truly ignore constructors in directors with %ignore and correct testcase that tests this

1 files changed, 32 insertions, 13 deletions

diff --git a/Examples/test-suite/director_ignore.i b/Examples/test-suite/director_ignore.i
index 05ba17ce1..57cbc13d8 100644
--- a/Examples/test-suite/director_ignore.i
+++ b/Examples/test-suite/director_ignore.i
@@ -68,6 +68,24 @@ class DAbstractIgnores
     virtual double OverloadedProtectedMethod() = 0;
 };
 
+template <typename T> class DTemplateAbstractIgnores
+{
+  T t;
+  public:
+    virtual ~DTemplateAbstractIgnores() {}
+    virtual double OverloadedMethod(int n, int xoffset = 0, int yoffset = 0) = 0;
+    virtual double OverloadedMethod(bool b) = 0;
+    virtual int Quadruple(int n) { return n*4; }
+    virtual int& References(int& n) { static int nn; nn=n; return nn; }
+    virtual int* Pointers(int* n) { static int nn; nn=*n; return &nn; }
+  protected:
+    virtual double OverloadedProtectedMethod(int n, int xoffset = 0, int yoffset = 0) = 0;
+    virtual double OverloadedProtectedMethod() = 0;
+};
+%}
+
+%template(DTemplateAbstractIgnoresInt) DTemplateAbstractIgnores<int>;
+
 class DIgnoreConstructor
 {
   public:
@@ -83,21 +101,22 @@ class DIgnoreOnlyConstructor
     DIgnoreOnlyConstructor(bool b) {}
 };
 
-template <typename T> class DTemplateAbstractIgnores
+%{
+class DIgnoreConstructor
 {
-  T t;
   public:
-    virtual ~DTemplateAbstractIgnores() {}
-    virtual double OverloadedMethod(int n, int xoffset = 0, int yoffset = 0) = 0;
-    virtual double OverloadedMethod(bool b) = 0;
-    virtual int Quadruple(int n) { return n*4; }
-    virtual int& References(int& n) { static int nn; nn=n; return nn; }
-    virtual int* Pointers(int* n) { static int nn; nn=*n; return &nn; }
-  protected:
-    virtual double OverloadedProtectedMethod(int n, int xoffset = 0, int yoffset = 0) = 0;
-    virtual double OverloadedProtectedMethod() = 0;
+    virtual ~DIgnoreConstructor() {}
+    DIgnoreConstructor(std::string s, int i) {}
+  private: // Hide constructor
+    DIgnoreConstructor(bool b) {}
 };
-%}
 
-%template(DTemplateAbstractIgnoresInt) DTemplateAbstractIgnores<int>;
+class DIgnoreOnlyConstructor
+{
+  public:
+    virtual ~DIgnoreOnlyConstructor() {}
+  private: // Hide constructor
+    DIgnoreOnlyConstructor(bool b) {}
+};
+%}