File tree Expand file tree Collapse file tree 4 files changed +12
-6
lines changed Expand file tree Collapse file tree 4 files changed +12
-6
lines changed Original file line number Diff line number Diff line change 16
16
* inst/unitTests/cpp/Module.cpp: Rename 'World' to 'ModuleWorld'
17
17
* inst/unitTests/runit.Module.R (test.Module): Ditto
18
18
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
+
19
25
2015-08-24 Dirk Eddelbuettel <
[email protected] >
20
26
21
27
* vignettes/Rcpp.bib: Updated R / R Core references
Original file line number Diff line number Diff line change 1
- # Copyright (C) 2010 - 2012 John Chambers, Dirk Eddelbuettel and Romain Francois
1
+ # Copyright (C) 2010 - 2015 John Chambers, Dirk Eddelbuettel and Romain Francois
2
2
#
3
3
# This file is part of Rcpp.
4
4
#
Original file line number Diff line number Diff line change 23
23
\itemize {
24
24
\item We no longer define multiple Modules objects named \code {World } in
25
25
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
26
27
}
27
28
}
28
29
}
Original file line number Diff line number Diff line change 2
2
//
3
3
// Reference.h: Rcpp R/C++ interface class library -- Reference class objects
4
4
//
5
- // Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
5
+ // Copyright (C) 2010 - 2015 Dirk Eddelbuettel and Romain Francois
6
6
//
7
7
// This file is part of Rcpp.
8
8
//
@@ -59,16 +59,15 @@ namespace Rcpp{
59
59
Reference_Impl ( const std::string& klass ) {
60
60
SEXP newSym = Rf_install (" new" );
61
61
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 ()) );
64
63
}
65
64
66
65
void update ( SEXP x){
67
- if ( ! ::Rf_isS4 (x) ) throw not_reference () ;
66
+ if ( ! ::Rf_isS4 (x) ) throw not_reference ();
68
67
}
69
68
} ;
70
69
71
- typedef Reference_Impl<PreserveStorage> Reference ;
70
+ typedef Reference_Impl<PreserveStorage> Reference;
72
71
73
72
} // namespace Rcpp
74
73
You can’t perform that action at this time.
0 commit comments