Various fixes for VC++7.1 and Sun Studio 10

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7257 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-06-03 21:25:00 +00:00
commit b707684fec
6 changed files with 14 additions and 14 deletions

View file

@ -148,7 +148,7 @@ class Allocate : public Dispatcher {
String *base_returntype = function_return_type(base);
returntype_match = Strcmp(this_returntype, base_returntype) == 0 ? true : false;
if (!returntype_match) {
covariant_returntype = SwigType_issubtype(this_returntype, base_returntype);
covariant_returntype = SwigType_issubtype(this_returntype, base_returntype) ? true : false;
returntype_match = covariant_returntype;
}
@ -168,8 +168,8 @@ class Allocate : public Dispatcher {
this_fn = SwigType_typedef_resolve_all(this_fn);
if (Strcmp(base_fn, this_fn) == 0) {
// Finally check that the qualifiers match
bool base_qualifier = SwigType_isqualifier(resolved_decl);
bool this_qualifier = SwigType_isqualifier(base_decl);
int base_qualifier = SwigType_isqualifier(resolved_decl);
int this_qualifier = SwigType_isqualifier(base_decl);
if (base_qualifier == this_qualifier) {
decl_match = true;
}