Skip to content

Commit 2c13121

Browse files
committed
Use variadic templates unconditionally in Function.h
Remove one generated file
1 parent 8235db9 commit 2c13121

File tree

3 files changed

+5
-142
lines changed

3 files changed

+5
-142
lines changed

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* inst/include/Rcpp/grow.h: Idem
55
* inst/include/Rcpp/DottedPair.h: Idem
66
* inst/include/Rcpp/Vector.h: Idem
7+
* inst/include/Rcpp/Function.h: Idem
78

89
* inst/include/Rcpp/module/Module_generated_class_constructor.h: Removed
910
* inst/include/Rcpp/module/Module_generated_class_factory.h: Idem
@@ -12,6 +13,7 @@
1213
* inst/include/Rcpp/generated/grow__pairlist.h: Idem
1314
* inst/include/Rcpp/generated/DottedPair__ctors.h: Idem
1415
* inst/include/Rcpp/generated/Vector__create.h: Idem
16+
* inst/include/Rcpp/generated/Function__operator.h: Idem
1517

1618
2025-03-15 Dirk Eddelbuettel <[email protected]>
1719

inst/include/Rcpp/Function.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,10 @@ namespace Rcpp{
8282
return Rcpp_fast_eval(call, R_GlobalEnv);
8383
}
8484

85-
#if defined(HAS_VARIADIC_TEMPLATES)
86-
template <typename... T>
87-
SEXP operator()(const T&... args) const {
85+
template <typename... T>
86+
SEXP operator()(const T&... args) const {
8887
return invoke(pairlist(args...), R_GlobalEnv);
89-
}
90-
#else
91-
#include <Rcpp/generated/Function__operator.h>
92-
#endif
88+
}
9389

9490
/**
9591
* Returns the environment of this function

inst/include/Rcpp/generated/Function__operator.h

Lines changed: 0 additions & 135 deletions
This file was deleted.

0 commit comments

Comments
 (0)