Fix issue preventing packages with Rcpp::interfaces attribute from compiling.

jjallaire · jjallaire · commit ef428d064cfd · 2014-02-16T13:52:36.000-07:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-16  JJ Allaire <jj@rstudio.org>
+
+        * src/attributes.cpp Replace (incorrect) call to 
+        Rcpp::internal::jumpToTop with Rf_onintr
+
 2014-02-07  Kevin Ushey  <kevinushey@gmail.com>
 
 	* inst/include/Rcpp/Reference.h: Add default ctor
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -16,6 +16,11 @@
       depending on IndexHash (unique, sort_unique, match) will now properly
       handle NA and NaN values for numeric vectors.
     }
+    \item Changes in Rcpp Attributes
+      \itemize{
+        \item Fix issue preventing packages with Rcpp::interfaces attribute
+      from compiling.
+      }
   }
 }
       
diff --git a/src/attributes.cpp b/src/attributes.cpp
@@ -2229,7 +2229,7 @@ namespace attributes {
                      << std::endl
                      << "    if (__isInterrupt) {" << std::endl
                      << "        UNPROTECT(1);" << std::endl
-                     << "        Rcpp::internal::jumpToTop();" << std::endl
+                     << "        Rf_onintr();" << std::endl
                      << "    }" << std::endl
                      << "    Rboolean __isError = Rf_inherits(__result, \"try-error\");"
                      << std::endl

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@`
`16`	`16`	`depending on IndexHash (unique, sort_unique, match) will now properly`
`17`	`17`	`handle NA and NaN values for numeric vectors.`
`18`	`18`	`}`
	`19`	`+ \item Changes in Rcpp Attributes`
	`20`	`+ \itemize{`
	`21`	`+ \item Fix issue preventing packages with Rcpp::interfaces attribute`
	`22`	`+ from compiling.`
	`23`	`+ }`
`19`	`24`	`}`
`20`	`25`	`}`
`21`	`26`