Fix SIM_test_ip for swig 4.2.0 and implemented review suggestions

nasa · Apr 12, 2024 · b8aedd7 · b8aedd7
1 parent 1e0d781
commit b8aedd7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/libexec/trick/convert_swig b/libexec/trick/convert_swig
@@ -619,7 +619,7 @@ sub process_class($$$$$) {
 
     if ( $curr_namespace ne "" ) {
        my @split_namespaces = split "::", $curr_namespace;
-       my $sanitized_namespace = @split_namespaces[-1] ;
+       my $sanitized_namespace = $split_namespaces[-1] ;
        my @namespace_split = split /namespace\s*$sanitized_namespace/, $$new_contents_ref;
        $save_namespace_content = 'namespace ' . $sanitized_namespace . @namespace_split[-1];
        $$new_contents_ref = join('namespace ' . $sanitized_namespace, @namespace_split[0 .. $#namespace_split-1]);

diff --git a/test/SIM_test_ip/models/test_ip/include/Namespace_tests.hh b/test/SIM_test_ip/models/test_ip/include/Namespace_tests.hh
@@ -54,8 +54,12 @@ namespace NS2 {
 class B {
    public :
    //TODO: in the clang based convert_swig, we can use NS1 without the leading ::
-   //NS1::A< int > m ;
+   //Since swig 4.2.0, leading :: causes error.
+#if SWIG_VERSION >= 0x040200
+   NS1::A< int > m ;
+#else
    ::NS1::A< int > m ;
+#endif
 } ;
 }
 #endif