Skip to content

Fix native registration for exports with name attribute (fixes #702) #703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 1, 2017
Merged

Fix native registration for exports with name attribute (fixes #702) #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
within package rather than current working directory.
* src/attributes.cpp: Execute tools::package_native_routine_registration_skeleton
within package rather than current working directory.
2017-06-01 JJ Allaire <jj@rstudio.com>

* src/attributes.cpp: Fix registration for exports with name attribute.

2017-05-22 Dirk Eddelbuettel <edd@debian.org>

Expand Down
1 change: 1 addition & 0 deletions inst/NEWS.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
within package rather than current working directory.
\item The R portion no longer uses \code{dir.exists} to no require R 3.2.0
or newer (Elias Pipping in \ghpr{698}).
\item Fix native registration for exports with name attribute (\ghit{702}).
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/attributes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1962,7 +1962,7 @@ namespace attributes {
std::vector<std::size_t> routineArgs;
for (std::size_t i=0;i<nativeRoutines_.size(); i++) {
const Attribute& attr = nativeRoutines_[i];
routineNames.push_back(package() + "_" + attr.exportedName());
routineNames.push_back(package() + "_" + attr.function().name());
routineArgs.push_back(attr.function().arguments().size());
}
if (hasCppInterface()) {
Expand Down