diff options
| author | AndLLA <44858649+AndLLA@users.noreply.github.com> | 2022-10-08 16:19:02 +0200 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2022-10-24 18:20:10 +0100 |
| commit | b885c22f1110b4d41d296ef593c4233f54d955ca (patch) | |
| tree | 9e52fdec27eb9f4304d483250974a080dd362fa5 | |
| parent | ba96783d1164011d7c7d88380236747273333cb9 (diff) | |
| download | swig-b885c22f1110b4d41d296ef593c4233f54d955ca.tar.gz | |
fixes from code review
| -rw-r--r-- | Examples/test-suite/r/Makefile.in | 3 | ||||
| -rw-r--r-- | Source/Modules/r.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Examples/test-suite/r/Makefile.in b/Examples/test-suite/r/Makefile.in index 9d3e9e706..78cc4bb53 100644 --- a/Examples/test-suite/r/Makefile.in +++ b/Examples/test-suite/r/Makefile.in @@ -25,8 +25,7 @@ CPP_TEST_CASES += \ r_overload_array \ r_sexp \ r_overload_comma \ - r_use_isnull \ - li_boost_shared_ptr + r_use_isnull # These tests are failing because enums currently cannot handle # arithmetic expressions diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 3ea48ea7b..18a9aa56d 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -2092,7 +2092,7 @@ int R::functionWrapper(Node *n) { Node * parent = Getattr(n, "parentNode"); String * smartname = Getattr(parent, "feature:smartptr"); if (smartname) { - String * classtypeobj = NewString(Getattr(parent, "classtypeobj")); // this is the correct name, e.g. ClassName(int) + String * classtypeobj = Getattr(parent, "classtypeobj"); // this is the correct name, e.g. ClassName(int) String * classtype = NewString(Getattr(parent, "classtype")); // this is the "wrong" name e.g. ClassName<int> // we replace inside smartname ClassName<int> with ClassName(int) @@ -2103,7 +2103,6 @@ int R::functionWrapper(Node *n) { String * smartname_fixed_rclass = getRClassName(smartname_fixed, 1, 1); Replaceall(tm, "$R_class", smartname_fixed_rclass); - Delete(classtypeobj); Delete(classtype); Delete(smartname_fixed); Delete(smartname_fixed_rclass); |