Skip to content

Commit 9cb51ab

Browse files
committed
reset error after evaluation
1 parent 7a4fadc commit 9cb51ab

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
2015-06-25 Kevin Ushey <[email protected]>
22

3+
* inst/include/Rcpp/api/meat/Rcpp_eval.h: reset error after Rcpp_eval
34
* inst/include/Rcpp/Function.h: catch empty error messages
45
* inst/include/Rcpp/api/meat/Rcpp_eval.h: protect call
56

inst/include/Rcpp/api/meat/Rcpp_eval.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ namespace Rcpp{
3838

3939
Shield<SEXP> expr(evalCall->expr) ;
4040

41-
reset_current_error() ;
42-
4341
Environment RCPP = Environment::Rcpp_namespace();
4442
SEXP withCallingHandlersSym = ::Rf_install("withCallingHandlers");
4543
SEXP tryCatchSym = ::Rf_install("tryCatch");
@@ -87,6 +85,9 @@ namespace Rcpp{
8785
evalCall->error_occurred = false;
8886
evalCall->result = res;
8987
}
88+
89+
reset_current_error() ;
90+
9091
}
9192

9293
inline SEXP Rcpp_eval(SEXP expr_, SEXP env) {

0 commit comments

Comments
 (0)