add/fix protected/private bases + template

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6747 626c5289-ae23-0410-ae9c-e8d60b6d4f22

SWIG/Examples/test-suite/abstract_inherit.i

@@ -21,4 +21,42 @@ public:
    Spam() { }
 };
 
+
+template <class Type>
+class NRFilter {
+public:
+  virtual ~NRFilter()
+  {
+  }
+  
+protected:
+  virtual void do_filter() = 0;
+};
+
+template <class Type>
+class NRRCFilter : public NRFilter<Type>
+{
+};
+ 
+
+template <class Type>
+class NRRCFilterpro : protected NRFilter<Type>
+{
+};
+
+
+template <class Type>
+class NRRCFilterpri : private NRFilter<Type>
+{
+};
+
 %}
+
+%template(NRFilter_i) NRFilter<int>;
+
+%template(NRRCFilter_i) NRRCFilter<int>;
+
+%template(NRRCFilterpro_i) NRRCFilterpro<int>;
+
+%template(NRRCFilterpri_i) NRRCFilterpri<int>;
+

SWIG/Source/CParse/templ.c

@@ -92,13 +92,17 @@ cparse_template_expand(Node *n, String *tname, String *rname, String *templatear
   } else if (Strcmp(nodeType(n),"class") == 0) {
     /* Patch base classes */
     {
-      List *bases = Getattr(n,"baselist");
+      char *baselists[] = {"baselist","protectedbaselist","privatebaselist"};
-      if (bases) {
+      int b = 0;
-	int i;
+      for (b = 0; b < 3; ++b) {
-	for (i = 0; i < Len(bases); i++) {
+	List *bases = Getattr(n,baselists[b]);
-	  String *name = Copy(Getitem(bases,i));
+	if (bases) {
-	  Setitem(bases,i,name);
+	  int i;
-	  Append(typelist,name);
+	  for (i = 0; i < Len(bases); i++) {
+	    String *name = Copy(Getitem(bases,i));
+	    Setitem(bases,i,name);
+	    Append(typelist,name);
+	  }
 	}
       }
     }