Skip to content

Commit 20013d4

Browse files
committed
changes to modules loading suggested by Kurt
1 parent 17ef95e commit 20013d4

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 0.12.0.3
3+
Version: 0.12.0.4
44
Date: 2015-08-26
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey,
66
Qiang Kou, Douglas Bates and John Chambers

R/loadModule.R

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ loadModule <- function( module, what = character(), loadNow,
6767
loadNow <- !is(loadM, "error")
6868
}
6969
if(loadNow) {
70-
.botched <- isBotchedSession()
70+
## .botched <- isBotchedSession()
71+
.botched <- FALSE
72+
7173
if(is.null(loadM))
7274
loadM <- tryCatch(Module( module, mustStart = TRUE, where = env ),
7375
error = function(e)e)

inst/include/Rcpp/Reference.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ namespace Rcpp{
5959
Reference_Impl( const std::string& klass ) {
6060
SEXP newSym = Rf_install("new");
6161
Shield<SEXP> call( Rf_lang2( newSym, Rf_mkString( klass.c_str() ) ) );
62-
Storage::set__( Rcpp_eval( call ) ) ;
62+
//Storage::set__( Rcpp_eval( call ) ) ;
63+
Storage::set__( Rcpp_eval( call , Rcpp::internal::get_Rcpp_namespace()) ) ;
6364
}
6465

6566
void update( SEXP x){

0 commit comments

Comments
 (0)