Skip to content

Commit 2ab0ecd

Browse files
authored
Merge pull request #703 from RcppCore/bugfix/rcpp-export-name-registration
Fix native registration for exports with name attribute (fixes #702)
2 parents ef4e9c5 + a29c4e0 commit 2ab0ecd

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
within package rather than current working directory.
99
* src/attributes.cpp: Execute tools::package_native_routine_registration_skeleton
1010
within package rather than current working directory.
11+
2017-06-01 JJ Allaire <[email protected]>
12+
13+
* src/attributes.cpp: Fix registration for exports with name attribute.
1114

1215
2017-05-22 Dirk Eddelbuettel <[email protected]>
1316

inst/NEWS.Rd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
within package rather than current working directory.
1616
\item The R portion no longer uses \code{dir.exists} to no require R 3.2.0
1717
or newer (Elias Pipping in \ghpr{698}).
18+
\item Fix native registration for exports with name attribute (\ghit{702}).
1819
}
1920
}
2021
}

src/attributes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,7 @@ namespace attributes {
19621962
std::vector<std::size_t> routineArgs;
19631963
for (std::size_t i=0;i<nativeRoutines_.size(); i++) {
19641964
const Attribute& attr = nativeRoutines_[i];
1965-
routineNames.push_back(package() + "_" + attr.exportedName());
1965+
routineNames.push_back(package() + "_" + attr.function().name());
19661966
routineArgs.push_back(attr.function().arguments().size());
19671967
}
19681968
if (hasCppInterface()) {

0 commit comments

Comments
 (0)