Skip to content

Commit 09b827f

Browse files
committed
Use variadic templates unconditionally in DataFrame.h
Remove one generated file
1 parent e963afa commit 09b827f

File tree

3 files changed

+7
-250
lines changed

3 files changed

+7
-250
lines changed

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* inst/include/Rcpp/traits/index_sequence.h: Idem
1212
* inst/include/Rcpp/traits/named_object.h: Idem
1313
* inst/include/Rcpp/Language.h: Idem
14+
* inst/include/Rcpp/DataFrame.h: Idem
1415

1516
* inst/include/Rcpp/module/Module_generated_class_constructor.h: Removed
1617
* inst/include/Rcpp/module/Module_generated_class_factory.h: Idem
@@ -31,6 +32,7 @@
3132
* inst/include/Rcpp/module/Module_generated_function.h: Idem
3233
* inst/include/Rcpp/module/Module_generated_get_signature.h: Idem
3334
* inst/include/Rcpp/generated/Language__ctors.h: Idem
35+
* inst/include/Rcpp/generated/DataFrame_generated.h: Idem
3436

3537
2025-03-15 Dirk Eddelbuettel <[email protected]>
3638

inst/include/Rcpp/DataFrame.h

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// DataFrame.h: Rcpp R/C++ interface class library -- data frames
44
//
5-
// Copyright (C) 2010 - 2021 Dirk Eddelbuettel and Romain Francois
5+
// Copyright (C) 2010 - 2025 Dirk Eddelbuettel and Romain Francois
66
//
77
// This file is part of Rcpp.
88
//
@@ -117,14 +117,10 @@ namespace Rcpp{
117117
static DataFrame_Impl create(){
118118
return DataFrame_Impl() ;
119119
}
120-
#if defined(HAS_VARIADIC_TEMPLATES)
121-
template <typename... T>
122-
static DataFrame_Impl create(const T&... args) {
123-
return DataFrame_Impl::from_list(Parent::create(args...));
124-
}
125-
#else
126-
#include <Rcpp/generated/DataFrame_generated.h>
127-
#endif
120+
template <typename... T>
121+
static DataFrame_Impl create(const T&... args) {
122+
return DataFrame_Impl::from_list(Parent::create(args...));
123+
}
128124

129125
private:
130126
void set__(SEXP x){

0 commit comments

Comments
 (0)