Skip to content

Commit 45f8f81

Browse files
committed
Make Rcpp call to nCompiler functions find them via namespace_env to support imports without depends of nCompiler
1 parent c52b01b commit 45f8f81

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

nCompiler/inst/include/nCompiler/nC_inter/post_Rcpp/loadedObjectHookC_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ class loadedObjectHookC : public loadedObjectHookBaseC {
1010
static void set_CnClass_env(Rcpp::Environment env) {CnClass_env = env;}
1111
static Rcpp::Environment get_CnClass_env() {return CnClass_env;}
1212
static SEXP setup_R_return_object_full(SEXP Xptr) {
13-
Rcpp::Environment nc("package:nCompiler");
13+
Rcpp::Environment nc = Environment::namespace_env("nCompiler"); // nc("package:nCompiler");
1414
Rcpp::Function newLOE(nc["new.loadedObjectEnv_full"]);
1515
return newLOE(Xptr, CnClass_env);
1616
};
1717
static SEXP setup_R_return_object(SEXP Xptr) {
18-
Rcpp::Environment nc("package:nCompiler");
18+
Rcpp::Environment nc = Environment::namespace_env("nCompiler");
1919
Rcpp::Function newLOE(nc["new.loadedObjectEnv"]);
2020
return newLOE(Xptr, CnClass_env);
2121
};

nCompiler/inst/nCompLocal_files/loadedObjectEnv.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// [[Rcpp::depends(nCompiler)]]
66

77
SEXP loadedObjectEnv(SEXP Xptr) {
8-
Rcpp::Environment nc("package:nCompiler");
8+
Rcpp::Environment nc = Environment::namespace_env("nCompiler"); //nc("package:nCompiler");
99
Rcpp::Function newLOE = nc["new.loadedObjectEnv"];
1010
return newLOE(Xptr);
1111
}

0 commit comments

Comments
 (0)