From 93e9b9f9fa9a208f6a02970aecee31a702ac74f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Thu, 8 Feb 2018 02:41:35 +0100 Subject: [PATCH] generate .Call(...) instead of .Primitive(.Call)(...) for cppFunction --- ChangeLog | 5 +++++ R/Attributes.R | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7da73b3d9..cc062f10b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-02-14 Kirill Müller + + * R/Attributes.R: Code compiled with cppFunction() uses .Call instead + of .Primitive(".Call"), #795 + 2018-02-07 Kevin Ushey * inst/include/Rcpp/longlong.h: Allow long long on 64bit Windows diff --git a/R/Attributes.R b/R/Attributes.R index 89d26b687..dcdfacc26 100644 --- a/R/Attributes.R +++ b/R/Attributes.R @@ -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)