]>
Commit | Line | Data |
---|---|---|
1 | *** SWIG\cplus.cxx.orig Fri May 18 13:03:34 2001 | |
2 | --- SWIG\cplus.cxx Fri May 18 13:07:42 2001 | |
3 | *************** | |
4 | *** 839,845 **** | |
5 | ||
6 | if (name) { | |
7 | if (strlen(name)) { | |
8 | ! if (strlen(ctype) > 0) { | |
9 | sprintf(temp,"%s %s", ctype, name); | |
10 | typeeq_derived(temp,name); // Map "struct foo" to "foo" | |
11 | typeeq_derived(name,temp); // Map "foo" to "struct foo" | |
12 | --- 839,845 ---- | |
13 | ||
14 | if (name) { | |
15 | if (strlen(name)) { | |
16 | ! if (strlen(ctype) > 0 && strcmp(ctype, "class") != 0) { | |
17 | sprintf(temp,"%s %s", ctype, name); | |
18 | typeeq_derived(temp,name); // Map "struct foo" to "foo" | |
19 | typeeq_derived(name,temp); // Map "foo" to "struct foo" | |
20 | *************** | |
21 | *** 1092,1098 **** | |
22 | ||
23 | // Make a type-equivalence allowing derived classes to be used in functions of the | |
24 | ||
25 | ! if (strlen(current_class->classtype) > 0) { | |
26 | temp1 = ""; | |
27 | temp1 << current_class->classtype << " " << current_class->classname; | |
28 | temp2 = ""; | |
29 | --- 1092,1099 ---- | |
30 | ||
31 | // Make a type-equivalence allowing derived classes to be used in functions of the | |
32 | ||
33 | ! if (strlen(current_class->classtype) > 0 && | |
34 | ! strcmp(current_class->classtype, "class") != 0) { | |
35 | temp1 = ""; | |
36 | temp1 << current_class->classtype << " " << current_class->classname; | |
37 | temp2 = ""; |