Skip to content

Commit 02e4cf6

Browse files
committed
minimal change for dynamic registration
1 parent c76a5c3 commit 02e4cf6

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

ChangeLog

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
2017-02-28 Dirk Eddelbuettel <[email protected]>
2+
3+
* src/Rcpp_init.cpp (R_init_Rcpp): Call R_useDynamicSymbols()
4+
5+
* DESCRIPTION (Version, Date): New minor version
6+
17
2017-02-25 Dirk Eddelbuettel <[email protected]>
28

3-
* vignettes/Rcpp-FAQ.Rnw: New subsection on C++11, C++14, C++17
9+
* vignettes/Rcpp-FAQ.Rnw: New subsection on C++11, C++14, C++17
410

511
2017-02-17 Dirk Eddelbuettel <[email protected]>
612

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 0.12.9.3
4-
Date: 2017-02-15
3+
Version: 0.12.9.4
4+
Date: 2017-02-28
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
66
Nathan Russell, Douglas Bates and John Chambers
77
Maintainer: Dirk Eddelbuettel <[email protected]>

src/Rcpp_init.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Rcpp_init.cpp : Rcpp R/C++ interface class library -- Initialize and register
44
//
5-
// Copyright (C) 2010 - 2016 John Chambers, Dirk Eddelbuettel and Romain Francois
5+
// Copyright (C) 2010 - 2017 John Chambers, Dirk Eddelbuettel and Romain Francois
66
//
77
// This file is part of Rcpp.
88
//
@@ -125,12 +125,14 @@ extern "C" void R_unload_Rcpp(DllInfo *info) { // #nocov start
125125
// Release resources
126126
} // #nocov end
127127

128-
extern "C" void R_init_Rcpp(DllInfo* info) {
128+
extern "C" void R_init_Rcpp(DllInfo* dllinfo) {
129129
setCurrentScope(0);
130130

131-
registerFunctions();
131+
registerFunctions(); // call wrapper to register export symbols
132132

133-
init_Rcpp_cache(); // init the cache
133+
R_useDynamicSymbols(dllinfo, FALSE); // set up symbol symbol lookup (cf R 3.4.0)
134134

135-
init_Rcpp_routines(info); // init routines
135+
init_Rcpp_cache(); // init the cache
136+
137+
init_Rcpp_routines(dllinfo); // init routines
136138
}

0 commit comments

Comments
 (0)