Skip to content

Commit cb288c9

Browse files
committed
use Rf_onintr rather than non-public Rf_jump_to_toplevel
1 parent 2c711fd commit cb288c9

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
2014-01-16 JJ Allaiare <jj@rstudio.org>
22

3+
* inst/include/Rcpp/macros/macros.h: Use Rf_onintr rather than
4+
non-public Rf_jump_to_toplevel
35
* inst/include/Rcpp/DateVector.h: Fix GreedyVector compilation error
46
* inst/include/Rcpp/DatetimeVector.h: Fix GreedyVector compilation error
57

inst/include/Rcpp/macros/macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#endif
3232

3333
#ifndef VOID_END_RCPP
34-
#define VOID_END_RCPP } catch( Rcpp::internal::InterruptedException& __ex__ ) { Rf_jump_to_toplevel(); } catch( std::exception& __ex__ ){ forward_exception_to_r( __ex__ ) ; } catch(...){ ::Rf_error( "c++ exception (unknown reason)" ) ; }
34+
#define VOID_END_RCPP } catch( Rcpp::internal::InterruptedException& __ex__ ) { Rf_onintr(); } catch( std::exception& __ex__ ){ forward_exception_to_r( __ex__ ) ; } catch(...){ ::Rf_error( "c++ exception (unknown reason)" ) ; }
3535
#endif
3636

3737
#ifndef END_RCPP

0 commit comments

Comments
 (0)