Fixed bizarre template default constructor + SwigValueWrapper() bug.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4513 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
59f10aa68b
commit
0b935a46be
1 changed files with 2 additions and 2 deletions
|
|
@ -265,6 +265,8 @@ SwigType *cplus_value_type(SwigType *t) {
|
||||||
String *s = NewStringf("SwigValueWrapper< %s >",t);
|
String *s = NewStringf("SwigValueWrapper< %s >",t);
|
||||||
Delete(td);
|
Delete(td);
|
||||||
return s;
|
return s;
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (SwigType_issimple(td) && SwigType_istemplate(td)) {
|
if (SwigType_issimple(td) && SwigType_istemplate(td)) {
|
||||||
|
|
@ -1368,7 +1370,6 @@ int Language::unrollVirtualMethods(Node *n,
|
||||||
Node *ni;
|
Node *ni;
|
||||||
String *type;
|
String *type;
|
||||||
String *nodeType;
|
String *nodeType;
|
||||||
String *c_decl;
|
|
||||||
String *storage;
|
String *storage;
|
||||||
String *classname;
|
String *classname;
|
||||||
String *decl;
|
String *decl;
|
||||||
|
|
@ -1381,7 +1382,6 @@ int Language::unrollVirtualMethods(Node *n,
|
||||||
for (ni = Getattr(n, "firstChild"); ni; ni = nextSibling(ni)) {
|
for (ni = Getattr(n, "firstChild"); ni; ni = nextSibling(ni)) {
|
||||||
nodeType = Getattr(ni, "nodeType");
|
nodeType = Getattr(ni, "nodeType");
|
||||||
storage = Getattr(ni, "storage");
|
storage = Getattr(ni, "storage");
|
||||||
c_decl = Getattr(ni, "cdecl");
|
|
||||||
decl = Getattr(ni, "decl");
|
decl = Getattr(ni, "decl");
|
||||||
if (!Cmp(nodeType, "cdecl") && SwigType_isfunction(decl)) {
|
if (!Cmp(nodeType, "cdecl") && SwigType_isfunction(decl)) {
|
||||||
int is_virtual = storage && !Cmp(storage, "virtual");
|
int is_virtual = storage && !Cmp(storage, "virtual");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue