Skip to content

Commit

Permalink
added ChangeLog and NEWS entry for Kurt's patch
Browse files Browse the repository at this point in the history
  • Loading branch information
eddelbuettel committed Aug 28, 2015
1 parent 20013d4 commit e462cf5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Expand Up @@ -16,6 +16,12 @@
* inst/unitTests/cpp/Module.cpp: Rename 'World' to 'ModuleWorld'
* inst/unitTests/runit.Module.R (test.Module): Ditto

2015-08-25 Kurt Hornik <Kurt.Hornik@wu.ac.at>

* R/loadModule.R: For now=TRUE, always set .botched to FALSE which
corresponds to the case of the methods package being in the search path
* inst/include/Rcpp/Reference.h: Call call with the internal Namespace

2015-08-24 Dirk Eddelbuettel <edd@debian.org>

* vignettes/Rcpp.bib: Updated R / R Core references
Expand Down
2 changes: 1 addition & 1 deletion R/loadModule.R
@@ -1,4 +1,4 @@
# Copyright (C) 2010 - 2012 John Chambers, Dirk Eddelbuettel and Romain Francois
# Copyright (C) 2010 - 2015 John Chambers, Dirk Eddelbuettel and Romain Francois
#
# This file is part of Rcpp.
#
Expand Down
1 change: 1 addition & 0 deletions inst/NEWS.Rd
Expand Up @@ -23,6 +23,7 @@
\itemize{
\item We no longer define multiple Modules objects named \code{World} in
the unit tests with was seen to have a bad effect with R 3.2.2 or later.
\item Applied patch by Kurt Hornik which improves how Rcpp loads Modules
}
}
}
Expand Down
9 changes: 4 additions & 5 deletions inst/include/Rcpp/Reference.h
Expand Up @@ -2,7 +2,7 @@
//
// Reference.h: Rcpp R/C++ interface class library -- Reference class objects
//
// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2010 - 2015 Dirk Eddelbuettel and Romain Francois
//
// This file is part of Rcpp.
//
Expand Down Expand Up @@ -59,16 +59,15 @@ namespace Rcpp{
Reference_Impl( const std::string& klass ) {
SEXP newSym = Rf_install("new");
Shield<SEXP> call( Rf_lang2( newSym, Rf_mkString( klass.c_str() ) ) );
//Storage::set__( Rcpp_eval( call ) ) ;
Storage::set__( Rcpp_eval( call , Rcpp::internal::get_Rcpp_namespace()) ) ;
Storage::set__( Rcpp_eval( call , Rcpp::internal::get_Rcpp_namespace()) );
}

void update( SEXP x){
if( ! ::Rf_isS4(x) ) throw not_reference() ;
if( ! ::Rf_isS4(x) ) throw not_reference();
}
} ;

typedef Reference_Impl<PreserveStorage> Reference ;
typedef Reference_Impl<PreserveStorage> Reference;

} // namespace Rcpp

Expand Down

0 comments on commit e462cf5

Please sign in to comment.