Skip to content

Commit ec2870b

Browse files
committed
Use variadic templates unconditionally in grow.h
Remove one generated file
1 parent 511f3be commit ec2870b

File tree

3 files changed

+20
-147
lines changed

3 files changed

+20
-147
lines changed

ChangeLog

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2025-03-18 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/include/Rcpp/module/class.h: Use variadic templates unconditionally
4+
* inst/include/Rcpp/grow.h: Idem
5+
6+
* inst/include/Rcpp/module/Module_generated_class_constructor.h: Removed
7+
* inst/include/Rcpp/module/Module_generated_class_factory.h: Idem
8+
* inst/include/Rcpp/module/Module_generated_method.h: Idem
9+
* inst/include/Rcpp/module/Module_generated_Pointer_method.h: Idem
10+
* inst/include/Rcpp/generated/grow__pairlist.h: Idem
11+
112
2025-03-15 Dirk Eddelbuettel <[email protected]>
213

314
* DESCRIPTION (Version, Date): Roll micro version and date

inst/include/Rcpp/generated/grow__pairlist.h

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

inst/include/Rcpp/grow.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,15 @@ namespace Rcpp {
7070
return grow(Rf_mkString(head), y);
7171
}
7272

73-
#if defined(HAS_VARIADIC_TEMPLATES)
74-
template <typename T1>
75-
SEXP pairlist(const T1& t1) {
76-
return grow( t1, R_NilValue ) ;
77-
}
78-
template <typename T, typename... TArgs>
79-
SEXP pairlist(const T& t1, const TArgs&... args) {
80-
return grow(t1, pairlist(args...));
81-
}
82-
#else
83-
#include <Rcpp/generated/grow__pairlist.h>
84-
#endif
73+
template <typename T1>
74+
SEXP pairlist(const T1& t1) {
75+
return grow( t1, R_NilValue ) ;
76+
}
77+
78+
template <typename T, typename... TArgs>
79+
SEXP pairlist(const T& t1, const TArgs&... args) {
80+
return grow(t1, pairlist(args...));
81+
}
8582

8683
} // namespace Rcpp
8784

0 commit comments

Comments
 (0)