Skip to content

Commit 2cb0d5e

Browse files
committed
R_GlobalEnv -> R_BaseEnv (#861)
1 parent 995f17b commit 2cb0d5e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ inline SEXP Rcpp_eval(SEXP expr, SEXP env) {
9494
SET_TAG(CDDR(call), ::Rf_install("error"));
9595
SET_TAG(CDDR(CDR(call)), ::Rf_install("interrupt"));
9696

97-
Shield<SEXP> res(internal::Rcpp_eval_impl(call, R_GlobalEnv));
97+
Shield<SEXP> res(internal::Rcpp_eval_impl(call, R_BaseEnv));
9898

9999
// check for condition results (errors, interrupts)
100100
if (Rf_inherits(res, "condition")) {
@@ -103,7 +103,7 @@ inline SEXP Rcpp_eval(SEXP expr, SEXP env) {
103103

104104
Shield<SEXP> conditionMessageCall(::Rf_lang2(::Rf_install("conditionMessage"), res));
105105

106-
Shield<SEXP> conditionMessage(internal::Rcpp_eval_impl(conditionMessageCall, R_GlobalEnv));
106+
Shield<SEXP> conditionMessage(internal::Rcpp_eval_impl(conditionMessageCall, R_BaseEnv));
107107
throw eval_error(CHAR(STRING_ELT(conditionMessage, 0)));
108108
}
109109

0 commit comments

Comments
 (0)