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

Various fixes for VC++7.1 and Sun Studio 10

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

6
SWIG/Source/Modules/allocate.cxx
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;
}

4
SWIG/Source/Modules/java.cxx
View file

@ -1486,7 +1486,7 @@ class JAVA : public Language {
String *baseclass = NULL;
String *c_baseclassname = NULL;
String *typemap_lookup_type = Getattr(n,"classtypeobj");
bool feature_director = Swig_directorclass(n);
bool feature_director = Swig_directorclass(n) ? true : false;
/* Deal with inheritance */
List *baselist = Getattr(n,"bases");
@ -2793,7 +2793,7 @@ class JAVA : public Language {
sym_name, sym_name);
Printf(code_wrap->code, " (void)jcls;\n");
Printf(code_wrap->code, " if (director) {\n");
Printf(code_wrap->code, " director->swig_java_change_ownership(jenv, jself, jtake_or_release);\n");
Printf(code_wrap->code, " director->swig_java_change_ownership(jenv, jself, jtake_or_release ? true : false);\n");
Printf(code_wrap->code, " }\n");
Printf(code_wrap->code, "}\n");

2
SWIG/Source/Modules/python.cxx
View file

@ -1407,7 +1407,7 @@ public:
emit_action(n,f);
if (directorsEnabled()) {
Printf(f->code, "} catch (Swig::DirectorException& e) {\n");
Printf(f->code, "} catch (Swig::DirectorException&) {\n");
Printf(f->code, " SWIG_fail;\n");
Printf(f->code, "}\n");
}