diff options
| author | Vladimir Kalinin <vkalinin@opendesign.com> | 2013-12-24 06:47:54 +0400 |
|---|---|---|
| committer | Vladimir Kalinin <vkalinin@opendesign.com> | 2013-12-24 06:47:54 +0400 |
| commit | 6b7185989a9c2ff145b011f55a4999018d6cbc63 (patch) | |
| tree | 299be6e0f0dfd1764d228e2e64faaf556fe3183b /Source | |
| parent | 715e254e0577af2c6964b58882e08d278dc64e0c (diff) | |
| download | swig-6b7185989a9c2ff145b011f55a4999018d6cbc63.tar.gz | |
additional check for template type, to handle constructors correctly
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CParse/parser.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index c6fe56b70..0fc1d758a 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -2676,8 +2676,8 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va Setattr(templnode,"sym:typename","1"); } /* for now, nested %template is allowed only in the same scope as the template declaration */ - if ($3 && !((currentOuterClass && (currentOuterClass != Getattr(nn, "nested:outer"))) - ||(extendmode && current_class && (current_class != Getattr(nn, "nested:outer"))))) { + if ($3 && !(nnisclass && ((currentOuterClass && (currentOuterClass != Getattr(nn, "nested:outer"))) + ||(extendmode && current_class && (current_class != Getattr(nn, "nested:outer")))))) { /* Comment this out for 1.3.28. We need to re-enable it later but first we need to |