Skip to content

Commit 462c58f

Browse files
authored
Merge pull request #531 from coatless/attributes_fix
Fix for redeclaration of 'Rboolean rcpp_isError_gen'
2 parents 211dfcd + 3f360fd commit 462c58f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/attributes.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2638,9 +2638,9 @@ namespace attributes {
26382638
}
26392639
ostr << "));" << std::endl;
26402640
ostr << " }" << std::endl;
2641-
ostr << " Rboolean rcpp_isError_gen = Rf_inherits(rcpp_result_gen, \"interrupted-error\");"
2641+
ostr << " Rboolean rcpp_isInterrupt_gen = Rf_inherits(rcpp_result_gen, \"interrupted-error\");"
26422642
<< std::endl
2643-
<< " if (rcpp_isError_gen) {" << std::endl
2643+
<< " if (rcpp_isInterrupt_gen) {" << std::endl
26442644
<< " UNPROTECT(1);" << std::endl
26452645
<< " Rf_onintr();" << std::endl
26462646
<< " }" << std::endl

0 commit comments

Comments
 (0)