more patches for dodgy gcc-2.96 compiler from Hugo van der Sanden

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7303 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-06-17 20:31:08 +00:00
commit 3c361ac244
2 changed files with 6 additions and 6 deletions

View file

@ -567,7 +567,7 @@ class CSHARP : public Language {
/* Get the intermediary class parameter types of the parameter */
if ((tm = Getattr(p,"tmap:imtype"))) {
String *inattributes = Getattr(p,"tmap:imtype:inattributes");
Printf(im_param_type, "%s%s", inattributes ? inattributes : empty_string, tm);
Printf(im_param_type, "%s%s", inattributes ? (const String *)inattributes : empty_string, tm);
} else {
Swig_warning(WARN_CSHARP_TYPEMAP_CSTYPE_UNDEF, input_file, line_number,
"No imtype typemap defined for %s\n", SwigType_str(pt,0));
@ -1620,7 +1620,7 @@ class CSHARP : public Language {
if ((tm = Getattr(p,"tmap:cstype"))) {
substituteClassname(pt, tm);
String *inattributes = Getattr(p,"tmap:cstype:inattributes");
Printf(param_type, "%s%s", inattributes ? inattributes : empty_string, (const String *)tm);
Printf(param_type, "%s%s", inattributes ? (const String *)inattributes : empty_string, tm);
} else {
Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number,
"No cstype typemap defined for %s\n", SwigType_str(pt,0));
@ -1800,7 +1800,7 @@ class CSHARP : public Language {
if ((tm = Getattr(p,"tmap:cstype"))) {
substituteClassname(pt, tm);
String *inattributes = Getattr(p,"tmap:cstype:inattributes");
Printf(param_type, "%s%s", inattributes ? inattributes : empty_string, tm);
Printf(param_type, "%s%s", inattributes ? (const String *)inattributes : empty_string, tm);
} else {
Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number,
"No cstype typemap defined for %s\n", SwigType_str(pt,0));
@ -2028,7 +2028,7 @@ class CSHARP : public Language {
if ((tm = Getattr(p,"tmap:cstype"))) {
substituteClassname(pt, tm);
String *inattributes = Getattr(p,"tmap:cstype:inattributes");
Printf(param_type, "%s%s", inattributes ? inattributes : empty_string, tm);
Printf(param_type, "%s%s", inattributes ? (const String *)inattributes : empty_string, tm);
} else {
Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number,
"No cstype typemap defined for %s\n", SwigType_str(pt,0));

View file

@ -2795,7 +2795,7 @@ MODULA3 ():
Printf (methods, "%s(%s)%s%s;%s\n",
methodname, arguments,
hasContent (rettype) ? ": " : "",
hasContent (rettype) ? rettype : "",
hasContent (rettype) ? (const String *)rettype : "",
isVirtual ? " (* base method *)" : "");
}
{
@ -3187,7 +3187,7 @@ MODULA3 ():
String *inmode = getMappedTypeNew (n, "m3wrapinmode", "", false);
String *intype = getMappedTypeNew (n, "m3wrapintype", "");
Printf (methods, "set%s(%s val:%s);\n",
m3name, (inmode != NIL) ? inmode : "", intype);
m3name, (inmode != NIL) ? (const String *)inmode : "", intype);
}
{
/* this was attached by functionWrapper