Skip to content

Generate .Call(...) instead of .Primitive(.Call)(...) for cppFunction #813

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
Feb 14, 2018
Merged

Generate .Call(...) instead of .Primitive(.Call)(...) for cppFunction #813

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
5 changes: 5 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2018-02-14 Kirill Müller <krlmlr@mailbox.org>

* R/Attributes.R: Code compiled with cppFunction() uses .Call instead
of .Primitive(".Call"), #795

2018-02-07 Kevin Ushey <kevinushey@gmail.com>

* inst/include/Rcpp/longlong.h: Allow long long on 64bit Windows
Expand Down
2 changes: 1 addition & 1 deletion R/Attributes.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
for (i in seq(along.with = args))
body[[i+2]] <- as.symbol(args[i])

body[[1L]] <- .Call
body[[1L]] <- quote(.Call)
body[[2L]] <- getNativeSymbolInfo(symbol, dll)$address

if (isVoid)
Expand Down