fix infinite loop reported by Olly when using %template() ... inside a class
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8765 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
b3fd2c21f9
commit
2c1318214c
1 changed files with 4 additions and 2 deletions
|
|
@ -879,7 +879,7 @@ static String *resolve_node_scope(String *cname) {
|
||||||
Delete(nname);
|
Delete(nname);
|
||||||
}
|
}
|
||||||
if (ns) {
|
if (ns) {
|
||||||
/* we will to try to create a new node using the namespaces we
|
/* we will try to create a new node using the namespaces we
|
||||||
can find in the scope name */
|
can find in the scope name */
|
||||||
List *scopes;
|
List *scopes;
|
||||||
String *sname;
|
String *sname;
|
||||||
|
|
@ -2509,7 +2509,9 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
|
||||||
tscope = Swig_symbol_current(); /* Get the current scope */
|
tscope = Swig_symbol_current(); /* Get the current scope */
|
||||||
|
|
||||||
/* If the class name is qualified. We need to create or lookup namespace entries */
|
/* If the class name is qualified. We need to create or lookup namespace entries */
|
||||||
$5 = resolve_node_scope($5);
|
if (!inclass) {
|
||||||
|
$5 = resolve_node_scope($5);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
we use the new namespace entry 'nscope' only to
|
we use the new namespace entry 'nscope' only to
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue