Skip to content

Commit b885c22

Browse files
AndLLAwsfulton
authored andcommitted
fixes from code review
1 parent ba96783 commit b885c22

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Examples/test-suite/r/Makefile.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ CPP_TEST_CASES += \
2525
r_overload_array \
2626
r_sexp \
2727
r_overload_comma \
28-
r_use_isnull \
29-
li_boost_shared_ptr
28+
r_use_isnull
3029

3130
# These tests are failing because enums currently cannot handle
3231
# arithmetic expressions

Source/Modules/r.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,7 +2092,7 @@ int R::functionWrapper(Node *n) {
20922092
Node * parent = Getattr(n, "parentNode");
20932093
String * smartname = Getattr(parent, "feature:smartptr");
20942094
if (smartname) {
2095-
String * classtypeobj = NewString(Getattr(parent, "classtypeobj")); // this is the correct name, e.g. ClassName(int)
2095+
String * classtypeobj = Getattr(parent, "classtypeobj"); // this is the correct name, e.g. ClassName(int)
20962096
String * classtype = NewString(Getattr(parent, "classtype")); // this is the "wrong" name e.g. ClassName<int>
20972097

20982098
// we replace inside smartname ClassName<int> with ClassName(int)
@@ -2103,7 +2103,6 @@ int R::functionWrapper(Node *n) {
21032103
String * smartname_fixed_rclass = getRClassName(smartname_fixed, 1, 1);
21042104
Replaceall(tm, "$R_class", smartname_fixed_rclass);
21052105

2106-
Delete(classtypeobj);
21072106
Delete(classtype);
21082107
Delete(smartname_fixed);
21092108
Delete(smartname_fixed_rclass);

0 commit comments

Comments
 (0)