Skip to content

Commit e462cf5

Browse files
committed
added ChangeLog and NEWS entry for Kurt's patch
1 parent 20013d4 commit e462cf5

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
* inst/unitTests/cpp/Module.cpp: Rename 'World' to 'ModuleWorld'
1717
* inst/unitTests/runit.Module.R (test.Module): Ditto
1818

19+
2015-08-25 Kurt Hornik <[email protected]>
20+
21+
* R/loadModule.R: For now=TRUE, always set .botched to FALSE which
22+
corresponds to the case of the methods package being in the search path
23+
* inst/include/Rcpp/Reference.h: Call call with the internal Namespace
24+
1925
2015-08-24 Dirk Eddelbuettel <[email protected]>
2026

2127
* vignettes/Rcpp.bib: Updated R / R Core references

R/loadModule.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2010 - 2012 John Chambers, Dirk Eddelbuettel and Romain Francois
1+
# Copyright (C) 2010 - 2015 John Chambers, Dirk Eddelbuettel and Romain Francois
22
#
33
# This file is part of Rcpp.
44
#

inst/NEWS.Rd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
\itemize{
2424
\item We no longer define multiple Modules objects named \code{World} in
2525
the unit tests with was seen to have a bad effect with R 3.2.2 or later.
26+
\item Applied patch by Kurt Hornik which improves how Rcpp loads Modules
2627
}
2728
}
2829
}

inst/include/Rcpp/Reference.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Reference.h: Rcpp R/C++ interface class library -- Reference class objects
44
//
5-
// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
5+
// Copyright (C) 2010 - 2015 Dirk Eddelbuettel and Romain Francois
66
//
77
// This file is part of Rcpp.
88
//
@@ -59,16 +59,15 @@ 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 ) ) ;
63-
Storage::set__( Rcpp_eval( call , Rcpp::internal::get_Rcpp_namespace()) ) ;
62+
Storage::set__( Rcpp_eval( call , Rcpp::internal::get_Rcpp_namespace()) );
6463
}
6564

6665
void update( SEXP x){
67-
if( ! ::Rf_isS4(x) ) throw not_reference() ;
66+
if( ! ::Rf_isS4(x) ) throw not_reference();
6867
}
6968
} ;
7069

71-
typedef Reference_Impl<PreserveStorage> Reference ;
70+
typedef Reference_Impl<PreserveStorage> Reference;
7271

7372
} // namespace Rcpp
7473

0 commit comments

Comments
 (0)