jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'SFbug1296' of https://github.com/ptomulik/swig into ptomulik-SFbug1296

Browse source
This commit is contained in:
William S Fulton 2013-01-05 20:13:19 +00:00
commit 3f1d77ee0f
3 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Examples/test-suite/common.mk
View file

@ -356,6 +356,7 @@ CPP_TEST_CASES += \
template_default \ template_default \
template_default2 \ template_default2 \
template_default_arg \ template_default_arg \
template_default_arg_virtual_destructor \
template_default_class_parms \ template_default_class_parms \
template_default_class_parms_typedef \ template_default_class_parms_typedef \
template_default_inherit \ template_default_inherit \

24
Examples/test-suite/template_default_arg_virtual_destructor.i Normal file
View file

@ -0,0 +1,24 @@
%module template_default_arg_virtual_destructor
// SF bug #1296:
// virtual destructor in template class (template specification having
// default parameter(s)) triggers the warning "illegal destructor name"
%inline %{
struct A {};
template <class X, class T = int>
struct B
{
B(T const&) {}
virtual ~B() {}
};
template <class X>
struct B<X,int>
{
B(int,int) {} // constructor specific to this partial specialization
virtual ~B() {} // "illegal destructor name" when ~B() is virtual
};
%}
%template(B_AF) B<A,float>;
%template(B_A) B<A>; // this instantiation triggert the warning

10
Source/CParse/parser.y
View file

@ -4472,17 +4472,7 @@ cpp_destructor_decl : NOT idtemplate LPAREN parms RPAREN cpp_end {
| VIRTUAL NOT idtemplate LPAREN parms RPAREN cpp_vend { | VIRTUAL NOT idtemplate LPAREN parms RPAREN cpp_vend {
String *name; String *name;
char *c = 0;
$$ = new_node("destructor"); $$ = new_node("destructor");
/* Check for template names. If the class is a template
and the constructor is missing the template part, we
add it */
if (Classprefix) {
c = strchr(Char(Classprefix),'<');
if (c && !Strchr($3,'<')) {
$3 = NewStringf("%s%s",$3,c);
}
}
Setattr($$,"storage","virtual"); Setattr($$,"storage","virtual");
name = NewStringf("%s",$3); name = NewStringf("%s",$3);
if (*(Char(name)) != '~') Insert(name,0,"~"); if (*(Char(name)) != '~') Insert(name,0,"~");