add proper default rule for function ptrs
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7649 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
6fea6d0346
commit
09e6c0071b
1 changed files with 8 additions and 1 deletions
|
|
@ -394,7 +394,8 @@ SwigType *SwigType_default(SwigType *t) {
|
||||||
#ifdef SWIG_NEW_TYPE_DEFAULT
|
#ifdef SWIG_NEW_TYPE_DEFAULT
|
||||||
SwigType *nr = Copy(r);
|
SwigType *nr = Copy(r);
|
||||||
SwigType_del_pointer(nr);
|
SwigType_del_pointer(nr);
|
||||||
def = NewStringf("p.");
|
def = SwigType_isfunction(nr) ?
|
||||||
|
NewStringf("") : NewStringf("p.");
|
||||||
SwigType_add_default(def, nr);
|
SwigType_add_default(def, nr);
|
||||||
Delete(nr);
|
Delete(nr);
|
||||||
#else
|
#else
|
||||||
|
|
@ -454,6 +455,12 @@ SwigType *SwigType_default(SwigType *t) {
|
||||||
} else {
|
} else {
|
||||||
def = NewString("enum SWIGTYPE");
|
def = NewString("enum SWIGTYPE");
|
||||||
}
|
}
|
||||||
|
} else if (SwigType_isfunction(r)) {
|
||||||
|
if (Strcmp(r,"f(ANY).SWIGTYPE") == 0) {
|
||||||
|
def = NewString("p.SWIGTYPE");
|
||||||
|
} else {
|
||||||
|
def = NewString("p.f(ANY).SWIGTYPE");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
def = NewString("SWIGTYPE");
|
def = NewString("SWIGTYPE");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue