Skip to content

Commit a448967

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

File tree

3 files changed

+8
-134
lines changed

3 files changed

+8
-134
lines changed

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* inst/include/Rcpp/traits/named_object.h: Idem
1313
* inst/include/Rcpp/Language.h: Idem
1414
* inst/include/Rcpp/DataFrame.h: Idem
15+
* inst/include/Rcpp/PairList.h: Idem
1516

1617
* inst/include/Rcpp/module/Module_generated_class_constructor.h: Removed
1718
* inst/include/Rcpp/module/Module_generated_class_factory.h: Idem
@@ -33,6 +34,7 @@
3334
* inst/include/Rcpp/module/Module_generated_get_signature.h: Idem
3435
* inst/include/Rcpp/generated/Language__ctors.h: Idem
3536
* inst/include/Rcpp/generated/DataFrame_generated.h: Idem
37+
* inst/include/Rcpp/generated/Pairlist__ctors.h: Idem
3638

3739
2025-03-15 Dirk Eddelbuettel <[email protected]>
3840

inst/include/Rcpp/Pairlist.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Pairlist.h: Rcpp R/C++ interface class library -- pair lists objects (LISTSXP)
44
//
5-
// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
5+
// Copyright (C) 2010 - 2025 Dirk Eddelbuettel and Romain Francois
66
//
77
// This file is part of Rcpp.
88
//
@@ -42,14 +42,11 @@ namespace Rcpp{
4242
Pairlist_Impl(SEXP x){
4343
Storage::set__(r_cast<LISTSXP>(x)) ;
4444
}
45-
#if defined(HAS_VARIADIC_TEMPLATES)
46-
template <typename... T>
47-
Pairlist_Impl(const T&... args ){
48-
Storage::set__(pairlist(args... )) ;
49-
}
50-
#else
51-
#include <Rcpp/generated/Pairlist__ctors.h>
52-
#endif
45+
template <typename... T>
46+
Pairlist_Impl(const T&... args ){
47+
Storage::set__(pairlist(args... )) ;
48+
}
49+
5350
void update(SEXP x) {
5451
if (TYPEOF(x) != LISTSXP) {
5552
Storage::set__(r_cast<LISTSXP>(x));

inst/include/Rcpp/generated/Pairlist__ctors.h

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

0 commit comments

Comments
 (0)