[Swig-cvs] SWIG/Source/Swig stype.c,1.53,1.54

[Marcelo M. <mar...@us...>]

Update of /cvsroot/swig/SWIG/Source/Swig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32075/Source/Swig

Modified Files:
	stype.c 
Log Message:
more fixes for template + def args

Index: stype.c
===================================================================
RCS file: /cvsroot/swig/SWIG/Source/Swig/stype.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** stype.c	28 Nov 2004 18:53:17 -0000	1.53
--- stype.c	5 Dec 2004 10:15:25 -0000	1.54
***************
*** 14,17 ****
--- 14,18 ----
  
  #include "swig.h"
+ #include "cparse.h"
  #include <ctype.h>
  
***************
*** 903,911 ****
    String *result,*base;
    SwigType *lt;
!   SwigType *ss = 0;
  
    if (SwigType_istemplate(s)) {
!     ss = SwigType_typedef_resolve_all(s);
      s = ss;
    }
    lt = SwigType_ltype(s);
--- 904,915 ----
    String *result,*base;
    SwigType *lt;
!   SwigType *ss = SwigType_typedef_resolve_all(s);
!   s = ss;
  
    if (SwigType_istemplate(s)) {
!     String *st = ss;
!     ss = Swig_cparse_template_deftype(st, 0);
      s = ss;
+     Delete(st);
    }
    lt = SwigType_ltype(s);