ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-25 07:41:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fully qualify TRICK_SWIG_TEMPLATE identifiers

Browse Source 
Closes #1003
This commit is contained in:
Derek Bankieris 2020-06-03 11:18:25 -05:00
parent 192dc51e86
commit 023b626fc4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libexec/trick/convert_swig
View File

@ -641,11 +641,15 @@ sub process_class($$$$$) {
#print "*** template_type_no_sp = $template_type_no_sp ***\n" ; #print "*** template_type_no_sp = $template_type_no_sp ***\n" ;
if ( ! exists $processed_templates{$template_type_no_sp} ) { if ( ! exists $processed_templates{$template_type_no_sp} ) {
$$new_contents_ref .= "\n#define TRICK_SWIG_TEMPLATE_$class_name${var_name}_template\n" ; my $sanitized_namespace = $curr_namespace =~ s/:/_/gr ;
my $identifier = "${sanitized_namespace}${class_name}_${var_name}" ;
my $trick_swig_template = "TRICK_SWIG_TEMPLATE_$identifier" ;
my $typedef = "\n#ifdef TRICK_SWIG_TEMPLATE_$class_name${var_name}_template\n" ; $$new_contents_ref .= "\n#define $trick_swig_template\n" ;
$typedef .= "\%template($class_name${var_name}_template) $template_full_type;\n" ;
$typedef .= "#undef TRICK_SWIG_TEMPLATE_$class_name${var_name}_template\n" ; my $typedef = "\n#ifdef $trick_swig_template\n" ;
$typedef .= "\%template($identifier) $template_full_type;\n" ;
$typedef .= "#undef $trick_swig_template\n" ;
$typedef .= "#endif\n" ; $typedef .= "#endif\n" ;
if ($qualified) { if ($qualified) {