Fix std::vector of pointers which failed if a pointer to a pointer of the container element type existed (Python)

Closes SF Bug 2359417 created after commit 93f039032204821d4fc363346587c90f640a1109 (svn rev 10958)

5 files changed, 120 insertions, 9 deletions

diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 1658e509b..c40630b42 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -87,7 +87,6 @@ CPP_TEST_BROKEN += \
 	director_nested_class \
 	exception_partial_info \
 	extend_variable \
-	li_std_vector_ptr \
 	li_boost_shared_ptr_template \
 	nested_private \
 	overload_complicated \
@@ -588,6 +587,7 @@ CPP_STD_TEST_CASES += \
 	li_std_vector \
 	li_std_vector_enum \
 	li_std_vector_member_var\
+	li_std_vector_ptr \
 	smart_pointer_inherit \
 	template_typedef_fnc \
 	template_type_namespace \
diff --git a/Examples/test-suite/go/li_std_vector_ptr_runme.go b/Examples/test-suite/go/li_std_vector_ptr_runme.go
index cee997ad0..a9f7fe91c 100644
--- a/Examples/test-suite/go/li_std_vector_ptr_runme.go
+++ b/Examples/test-suite/go/li_std_vector_ptr_runme.go
@@ -1,12 +1,19 @@
 package main
 
 import . "./li_std_vector_ptr"
+import "fmt"
 
+func check(val1 int, val2 int) {
+	if val1 != val2 {
+		panic(fmt.Sprintf("Values are not the same %d %d", val1, val2))
+	}
+}
 func main() {
 	ip1 := MakeIntPtr(11)
 	ip2 := MakeIntPtr(22)
 	vi := NewIntPtrVector()
 	vi.Add(ip1)
 	vi.Add(ip2)
-	DisplayVector(vi)
+	check(GetValueFromVector(vi, 0), 11)
+	check(GetValueFromVector(vi, 1), 22)
 }
diff --git a/Examples/test-suite/li_std_vector_ptr.i b/Examples/test-suite/li_std_vector_ptr.i
index 292c9d700..e543ae967 100644
--- a/Examples/test-suite/li_std_vector_ptr.i
+++ b/Examples/test-suite/li_std_vector_ptr.i
@@ -1,4 +1,4 @@
-// Bug 2359417
+// SF Bug 2359417
 %module li_std_vector_ptr
 
 %include "std_vector.i"
@@ -15,16 +15,76 @@ double* makeDoublePtr(double v) {
   return new double(v);
 }
 
-#if 1
+// pointer to pointer in the wrappers was preventing a vector of pointers from working
 int** makeIntPtrPtr(int* v) {
   return new int*(v);
 }
-#endif
 
 void displayVector(std::vector<int *> vpi) {
   cout << "displayVector..." << endl;
   for (int i=0; i<vpi.size(); ++i)
     cout << *vpi[i] << endl;
 }
+int getValueFromVector(std::vector<int *> vpi, size_t index) {
+  return *vpi[index];
+}
+%}
+
+// A not exposed to wrappers
+%{
+struct A {
+  int val;
+  A(int val) : val(val) {}
+};
+%}
+
+%template(APtrVector) std::vector<A *>;
+
+%inline %{
+A *makeA(int val) { return new A(val); }
+int getVal(A* a) { return a->val; }
+int getVectorValueA(std::vector<A *> vpi, size_t index) {
+  return vpi[index]->val;
+}
+%}
+
+// B is fully exposed to wrappers
+%inline %{
+struct B {
+  int val;
+  B(int val = 0) : val(val) {}
+};
+%}
+
+%template(BPtrVector) std::vector<B *>;
+
+%inline %{
+B *makeB(int val) { return new B(val); }
+int getVal(B* b) { return b->val; }
+int getVectorValueB(std::vector<B *> vpi, size_t index) {
+  return vpi[index]->val;
+}
+%}
+
+// C is fully exposed to wrappers (includes code using B **)
+%inline %{
+struct C {
+  int val;
+  C(int val = 0) : val(val) {}
+};
+%}
+
+%template(CPtrVector) std::vector<C *>;
+
+%inline %{
+// pointer to pointer in the wrappers was preventing a vector of pointers from working
+C** makeCIntPtrPtr(C* v) {
+  return new C*(v);
+}
+C *makeC(int val) { return new C(val); }
+int getVal(C* b) { return b->val; }
+int getVectorValueC(std::vector<C *> vpi, size_t index) {
+  return vpi[index]->val;
+}
 %}
 
diff --git a/Examples/test-suite/python/li_std_vector_ptr_runme.py b/Examples/test-suite/python/li_std_vector_ptr_runme.py
index 01c654109..b49cdb4e9 100644
--- a/Examples/test-suite/python/li_std_vector_ptr_runme.py
+++ b/Examples/test-suite/python/li_std_vector_ptr_runme.py
@@ -1,7 +1,38 @@
 from li_std_vector_ptr import *
 
+def check(val1, val2):
+    if val1 != val2:
+        raise RuntimeError("Values are not the same %s %s" % (val1, val2))
 ip1 = makeIntPtr(11)
 ip2 = makeIntPtr(22)
 
 vi = IntPtrVector((ip1, ip2))
-displayVector(vi)
+check(getValueFromVector(vi, 0), 11)
+check(getValueFromVector(vi, 1), 22)
+
+vA = APtrVector([makeA(33), makeA(34)])
+check(getVectorValueA(vA, 0), 33)
+
+vB = BPtrVector([makeB(133), makeB(134)])
+check(getVectorValueB(vB, 0), 133)
+
+vC = CPtrVector([makeC(1133), makeC(1134)])
+check(getVectorValueC(vC, 0), 1133)
+
+
+vA = [makeA(233), makeA(234)]
+check(getVectorValueA(vA, 0), 233)
+
+vB = [makeB(333), makeB(334)]
+check(getVectorValueB(vB, 0), 333)
+
+vC = [makeC(3333), makeC(3334)]
+check(getVectorValueC(vC, 0), 3333)
+
+# mixed A and B should not be accepted
+vAB = [makeA(999), makeB(999)]
+try:
+  check(getVectorValueA(vAB, 0), 999)
+  raise RuntimeError("missed exception")
+except TypeError:
+  pass
diff --git a/Lib/std/std_common.i b/Lib/std/std_common.i
index b79eaff3a..05bc4325a 100644
--- a/Lib/std/std_common.i
+++ b/Lib/std/std_common.i
@@ -99,8 +99,21 @@ namespace swig {
     return traits<typename noconst_traits<Type >::noconst_type >::type_name();
   }
 
-  template <class Type>
-  struct traits_info {
+  template <class Type> struct traits_info {
+    static swig_type_info *type_query(std::string name) {
+      name += " *";
+      return SWIG_TypeQuery(name.c_str());
+    }
+    static swig_type_info *type_info() {
+      static swig_type_info *info = type_query(type_name<Type>());
+      return info;
+    }
+  };
+
+  /*
+    Partial specialization for pointers (traits_info)
+  */
+  template <class Type> struct traits_info<Type *> {
     static swig_type_info *type_query(std::string name) {
       name += " *";
       return SWIG_TypeQuery(name.c_str());
@@ -117,7 +130,7 @@ namespace swig {
   }
 
   /*
-    Partial specialization for pointers
+    Partial specialization for pointers (traits)
   */
   template <class Type> struct traits <Type *> {
     typedef pointer_category category;