Skip to content

Commit e963afa

Browse files
committed
Use variadic templates unconditionally in Language.h
Remove one generated file
1 parent ddf229b commit e963afa

File tree

3 files changed

+11
-160
lines changed

3 files changed

+11
-160
lines changed

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* inst/include/Rcpp/Module.h: Idem
1111
* inst/include/Rcpp/traits/index_sequence.h: Idem
1212
* inst/include/Rcpp/traits/named_object.h: Idem
13+
* inst/include/Rcpp/Language.h: Idem
1314

1415
* inst/include/Rcpp/module/Module_generated_class_constructor.h: Removed
1516
* inst/include/Rcpp/module/Module_generated_class_factory.h: Idem
@@ -29,6 +30,7 @@
2930
* inst/include/Rcpp/module/Module_generated_ctor_signature.h: Idem
3031
* inst/include/Rcpp/module/Module_generated_function.h: Idem
3132
* inst/include/Rcpp/module/Module_generated_get_signature.h: Idem
33+
* inst/include/Rcpp/generated/Language__ctors.h: Idem
3234

3335
2025-03-15 Dirk Eddelbuettel <[email protected]>
3436

inst/include/Rcpp/Language.h

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
// Language.h: Rcpp R/C++ interface class library -- language objects (calls)
33
//
4-
// Copyright (C) 2010 - 2022 Dirk Eddelbuettel and Romain Francois
4+
// Copyright (C) 2010 - 2025 Dirk Eddelbuettel and Romain Francois
55
//
66
// This file is part of Rcpp.
77
//
@@ -102,19 +102,15 @@ namespace Rcpp{
102102
* 0.0 is wrapped as a numeric vector using wrap( const& double )
103103
* ...
104104
*/
105-
#if defined(HAS_VARIADIC_TEMPLATES)
106-
template <typename... T>
107-
Language_Impl(const std::string& symbol, const T&... t) {
108-
Storage::set__(pairlist(Rf_install(symbol.c_str()), t...) );
109-
}
105+
template <typename... T>
106+
Language_Impl(const std::string& symbol, const T&... t) {
107+
Storage::set__(pairlist(Rf_install(symbol.c_str()), t...) );
108+
}
110109

111-
template <typename... T>
112-
Language_Impl(const Function& function, const T&... t) {
113-
Storage::set__(pairlist(function, t...));
114-
}
115-
#else
116-
#include <Rcpp/generated/Language__ctors.h>
117-
#endif
110+
template <typename... T>
111+
Language_Impl(const Function& function, const T&... t) {
112+
Storage::set__(pairlist(function, t...));
113+
}
118114

119115
/**
120116
* sets the symbol of the call

inst/include/Rcpp/generated/DataFrame_generated.h

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

0 commit comments

Comments
 (0)