Skip to content

Commit 39e492f

Browse files
committed
don't mask Rf_jump_to_toplevel
1 parent 005b455 commit 39e492f

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

inst/include/Rcpp/Interrupt.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ namespace Rcpp {
4343
return interruptedError;
4444
}
4545

46-
// Interrupt R's execution by jumping to the top-level
47-
inline void jumpToTop() {
48-
Rf_jump_to_toplevel();
49-
}
50-
5146
} // namespace internal
5247

5348
// Helper function to check for interrupts. This is invoked within

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__ ) { Rcpp::internal::jumpToTop(); } 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_jump_to_toplevel(); } 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)