Skip to content

Commit b4f9925

Browse files
committed
Use variadic templates unconditionally in InternalFunction.h
Remove one generated file
1 parent a448967 commit b4f9925

File tree

4 files changed

+2
-1728
lines changed

4 files changed

+2
-1728
lines changed

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* inst/include/Rcpp/Language.h: Idem
1414
* inst/include/Rcpp/DataFrame.h: Idem
1515
* inst/include/Rcpp/PairList.h: Idem
16+
* inst/include/Rcpp/InternalFunction.h: Idem
1617

1718
* inst/include/Rcpp/module/Module_generated_class_constructor.h: Removed
1819
* inst/include/Rcpp/module/Module_generated_class_factory.h: Idem
@@ -35,6 +36,7 @@
3536
* inst/include/Rcpp/generated/Language__ctors.h: Idem
3637
* inst/include/Rcpp/generated/DataFrame_generated.h: Idem
3738
* inst/include/Rcpp/generated/Pairlist__ctors.h: Idem
39+
* inst/include/Rcpp/generated/InternalFunction__ctors.h: Idem
3840

3941
2025-03-15 Dirk Eddelbuettel <[email protected]>
4042

inst/include/Rcpp/InternalFunction.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626

2727
#include <Rcpp/grow.h>
2828

29-
#ifdef RCPP_USING_CXX11
3029
#include <Rcpp/InternalFunctionWithStdFunction.h>
31-
#endif
3230

3331
namespace Rcpp{
3432

@@ -37,7 +35,6 @@ namespace Rcpp{
3735

3836
RCPP_GENERATE_CTOR_ASSIGN(InternalFunction_Impl)
3937

40-
#ifdef RCPP_USING_CXX11
4138
template <typename RESULT_TYPE, typename... Args>
4239
InternalFunction_Impl(const std::function<RESULT_TYPE(Args...)> &fun) {
4340
set(
@@ -51,9 +48,6 @@ namespace Rcpp{
5148
InternalFunction_Impl(RESULT_TYPE (*fun)(T...)) {
5249
set(XPtr<CppFunctionN<RESULT_TYPE, T...> >(new CppFunctionN<RESULT_TYPE, T...>(fun), true));
5350
}
54-
#else
55-
#include <Rcpp/generated/InternalFunction__ctors.h>
56-
#endif
5751

5852
void update(SEXP){}
5953
private:

0 commit comments

Comments
 (0)