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:
parent
c12129c0a8
commit
b707684fec
6 changed files with 14 additions and 14 deletions
|
|
@ -30,7 +30,7 @@
|
|||
%csnothrowexception NoThrowException() {
|
||||
try {
|
||||
$action
|
||||
} catch(Ex e) {
|
||||
} catch(Ex) {
|
||||
// swallowed
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
// Statically typed languages use in/out for variables
|
||||
%typemap(in) int "this_will_not_compile_in "
|
||||
%typemap(out) int "this_will_not_compile_out"
|
||||
%typemap(in) int globul "/*int globul in */"
|
||||
%typemap(in) int globul "/*int globul in */ $1=0;"
|
||||
%typemap(out) int globul "/*int globul out*/"
|
||||
%typemap(in) int Space::nspace "/*int nspace in */"
|
||||
%typemap(in) int Space::nspace "/*int nspace in */ $1=0;"
|
||||
%typemap(out) int Space::nspace "/*int nspace out*/"
|
||||
%typemap(in) int member "/*int member in */"
|
||||
%typemap(in) int member "/*int member in */ $1=0;"
|
||||
%typemap(out) int member "/*int member out*/"
|
||||
%typemap(in) int Space::Struct::smember "/*int smember in */"
|
||||
%typemap(in) int Space::Struct::smember "/*int smember in */ $1=0;"
|
||||
%typemap(out) int Space::Struct::smember "/*int smember out*/"
|
||||
|
||||
%typemap(javain) int "this_will_not_compile_javain "
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ template<typename T> struct Base {
|
|||
virtual IntegerPtr defaultargs(double d, int * a = 0) = 0;
|
||||
static void StaticHidden() {}
|
||||
void AmIAmINotVirtual() {}
|
||||
IntegerPtr NotVirtual(IntegerPtr i) {}
|
||||
IntegerPtr NotVirtual(IntegerPtr i) { return 0; }
|
||||
virtual Base * covariant(int a = 0, int * i = 0) { return 0; }
|
||||
typedef Base * BasePtr;
|
||||
virtual BasePtr covariant2() { return 0; }
|
||||
|
|
@ -172,7 +172,7 @@ template<typename T> struct Derived : Base<T> {
|
|||
Double function() { return 0; }
|
||||
int * defaultargs(Double d, IntegerPtr a = 0) { return 0; }
|
||||
void AmIAmINotVirtual() {}
|
||||
int * NotVirtual(int *i) {}
|
||||
int * NotVirtual(int *i) { return 0; }
|
||||
typedef Derived * DerivedPtr;
|
||||
DerivedPtr covariant(int a = 0, IntegerPtr i = 0) { return 0; }
|
||||
DerivedPtr covariant2() { return 0; }
|
||||
|
|
@ -185,7 +185,7 @@ template<typename T> struct Bottom : Derived<T> {
|
|||
int * method() const { return 0; }
|
||||
static void StaticHidden() {}
|
||||
void AmIAmINotVirtual() {}
|
||||
IntegerPtr NotVirtual(IntegerPtr i) {}
|
||||
IntegerPtr NotVirtual(IntegerPtr i) { return 0; }
|
||||
void (*funcptr)(int a, bool b);
|
||||
Bottom<T> * covariant(int a = 0, IntegerPtr i = 0) { return 0; }
|
||||
Derived<T> * covariant2() { return 0; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue