jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*** empty log message ***

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7101 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-03-28 19:43:55 +00:00
commit bf0ae5ee50
2 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SWIG/CHANGES.current
View file

@ -1,6 +1,10 @@
Version 1.3.25 (In progress) Version 1.3.25 (In progress)
============================ ============================
03/22/2005: wsfulton
Enum casting fixes. Visual C++ didn't like the C type casting SWIG produced
when wrapping C++ enum references, as reported by Admire Kandawasvika.
03/21/2005: wsfulton 03/21/2005: wsfulton
[Perl] SF #1124490. Fix Perl macro clashes when using Visual Studio's STL string, [Perl] SF #1124490. Fix Perl macro clashes when using Visual Studio's STL string,
so now projects can #include <string>. so now projects can #include <string>.

13
SWIG/Source/Swig/typesys.c
View file

@ -507,14 +507,14 @@ static Typetab *resolved_scope = 0;
static SwigType * static SwigType *
typedef_resolve(Typetab *s, String *base) { typedef_resolve(Typetab *s, String *base) {
Hash *ttab; Hash *ttab;
SwigType *type; SwigType *type = 0;
List *inherit; List *inherit;
Typetab *parent; Typetab *parent;
/* if (!s) return 0; *//* now is checked bellow */ /* if (!s) return 0; *//* now is checked bellow */
/* Printf(stdout,"Typetab %s : %s\n", Getattr(s,"name"), base); */ /* Printf(stdout,"Typetab %s : %s\n", Getattr(s,"name"), base); */
if (Getmark(s)) return 0; if (!Getmark(s)) {
Setmark(s,1); Setmark(s,1);
ttab = Getattr(s,k_typetab); ttab = Getattr(s,k_typetab);
@ -522,8 +522,7 @@ typedef_resolve(Typetab *s, String *base) {
if (type) { if (type) {
resolved_scope = s; resolved_scope = s;
Setmark(s,0); Setmark(s,0);
return type; } else {
}
/* Hmmm. Not found in my scope. It could be in an inherited scope */ /* Hmmm. Not found in my scope. It could be in an inherited scope */
inherit = Getattr(s,k_inherit); inherit = Getattr(s,k_inherit);
if (inherit) { if (inherit) {
@ -533,13 +532,17 @@ typedef_resolve(Typetab *s, String *base) {
type = typedef_resolve(Getitem(inherit,i), base); type = typedef_resolve(Getitem(inherit,i), base);
if (type) { if (type) {
Setmark(s,0); Setmark(s,0);
return type; break;
} }
} }
} }
if (!type) {
parent = Getattr(s,k_parent); parent = Getattr(s,k_parent);
type = parent ? typedef_resolve(parent, base) : 0; type = parent ? typedef_resolve(parent, base) : 0;
Setmark(s,0); Setmark(s,0);
}
}
}
return type; return type;
} }