Skip to content

Commit bf2ede8

Browse files
committed
Use variadic templates unconditionally in call.h
and also in InternalFunctionWithStdFunction.h Remove one generated file
1 parent 2c13121 commit bf2ede8

File tree

4 files changed

+5
-2583
lines changed

4 files changed

+5
-2583
lines changed

ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* inst/include/Rcpp/DottedPair.h: Idem
66
* inst/include/Rcpp/Vector.h: Idem
77
* inst/include/Rcpp/Function.h: Idem
8+
* inst/include/Rcpp/internal/call.h: Idem
9+
* inst/include/Rcpp/InternalFunctionWithStdFunction.h: Idem
810

911
* inst/include/Rcpp/module/Module_generated_class_constructor.h: Removed
1012
* inst/include/Rcpp/module/Module_generated_class_factory.h: Idem
@@ -14,6 +16,7 @@
1416
* inst/include/Rcpp/generated/DottedPair__ctors.h: Idem
1517
* inst/include/Rcpp/generated/Vector__create.h: Idem
1618
* inst/include/Rcpp/generated/Function__operator.h: Idem
19+
* inst/include/Rcpp/generated/InternalFunctionWithStdFunction_call.h: Idem
1720

1821
2025-03-15 Dirk Eddelbuettel <[email protected]>
1922

inst/include/Rcpp/InternalFunctionWithStdFunction.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
21
//
32
// InternalFunction_with_std_function.h: Rcpp R/C++ interface class library -- exposing C++ std::function's
43
//
5-
// Copyright (C) 2014 Christian Authmann
6-
// Copyright (C) 2015 Romain Francois and Dirk Eddelbuettel
4+
// Copyright (C) 2014 - 2025 Christian Authmann
5+
// Copyright (C) 2015 - 2025 Romain Francois and Dirk Eddelbuettel
76
//
87
// This file is part of Rcpp.
98
//
@@ -23,17 +22,12 @@
2322
#ifndef Rcpp_InternalFunctionWithStdFunction_h
2423
#define Rcpp_InternalFunctionWithStdFunction_h
2524

26-
#if defined(HAS_VARIADIC_TEMPLATES)
2725
#include <Rcpp/internal/call.h>
28-
#endif
2926
#include <functional>
3027

3128
namespace Rcpp {
3229

3330
namespace InternalFunctionWithStdFunction {
34-
#if !defined(HAS_VARIADIC_TEMPLATES) && !defined(RCPP_USING_CXX11)
35-
#include <Rcpp/generated/InternalFunctionWithStdFunction_call.h>
36-
#endif
3731

3832
template <typename RESULT_TYPE, typename... Args>
3933
class CppFunctionBaseFromStdFunction : public CppFunctionBase {

0 commit comments

Comments
 (0)