Skip to content

Commit ef428d0

Browse files
committed
Fix issue preventing packages with Rcpp::interfaces attribute from compiling.
1 parent 86f1426 commit ef428d0

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2014-02-16 JJ Allaire <[email protected]>
2+
3+
* src/attributes.cpp Replace (incorrect) call to
4+
Rcpp::internal::jumpToTop with Rf_onintr
5+
16
2014-02-07 Kevin Ushey <[email protected]>
27

38
* inst/include/Rcpp/Reference.h: Add default ctor

inst/NEWS.Rd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
depending on IndexHash (unique, sort_unique, match) will now properly
1717
handle NA and NaN values for numeric vectors.
1818
}
19+
\item Changes in Rcpp Attributes
20+
\itemize{
21+
\item Fix issue preventing packages with Rcpp::interfaces attribute
22+
from compiling.
23+
}
1924
}
2025
}
2126

src/attributes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2229,7 +2229,7 @@ namespace attributes {
22292229
<< std::endl
22302230
<< " if (__isInterrupt) {" << std::endl
22312231
<< " UNPROTECT(1);" << std::endl
2232-
<< " Rcpp::internal::jumpToTop();" << std::endl
2232+
<< " Rf_onintr();" << std::endl
22332233
<< " }" << std::endl
22342234
<< " Rboolean __isError = Rf_inherits(__result, \"try-error\");"
22352235
<< std::endl

0 commit comments

Comments
 (0)