File tree Expand file tree Collapse file tree 2 files changed +4
-2
lines changed
inst/include/Rcpp/api/meat Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Original file line number Diff line number Diff line change 1
1
2015-06-25 Kevin Ushey <
[email protected] >
2
2
3
+ * inst/include/Rcpp/api/meat/Rcpp_eval.h: reset error after Rcpp_eval
3
4
* inst/include/Rcpp/Function.h: catch empty error messages
4
5
* inst/include/Rcpp/api/meat/Rcpp_eval.h: protect call
5
6
Original file line number Diff line number Diff line change @@ -38,8 +38,6 @@ namespace Rcpp{
38
38
39
39
Shield<SEXP> expr (evalCall->expr ) ;
40
40
41
- reset_current_error () ;
42
-
43
41
Environment RCPP = Environment::Rcpp_namespace ();
44
42
SEXP withCallingHandlersSym = ::Rf_install (" withCallingHandlers" );
45
43
SEXP tryCatchSym = ::Rf_install (" tryCatch" );
@@ -87,6 +85,9 @@ namespace Rcpp{
87
85
evalCall->error_occurred = false ;
88
86
evalCall->result = res;
89
87
}
88
+
89
+ reset_current_error () ;
90
+
90
91
}
91
92
92
93
inline SEXP Rcpp_eval (SEXP expr_, SEXP env) {
You can’t perform that action at this time.
0 commit comments