Skip to content

Commit 7654d5e

Browse files
committed
Use variadic templates unconditionally in DottedPair.h
Remove one generated file
1 parent ec2870b commit 7654d5e

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
* inst/include/Rcpp/module/class.h: Use variadic templates unconditionally
44
* inst/include/Rcpp/grow.h: Idem
5+
* inst/include/Rcpp/DottedPair.h: Idem
56

67
* inst/include/Rcpp/module/Module_generated_class_constructor.h: Removed
78
* inst/include/Rcpp/module/Module_generated_class_factory.h: Idem
89
* inst/include/Rcpp/module/Module_generated_method.h: Idem
910
* inst/include/Rcpp/module/Module_generated_Pointer_method.h: Idem
1011
* inst/include/Rcpp/generated/grow__pairlist.h: Idem
12+
* inst/include/Rcpp/generated/DottedPair__ctors.h: Idem
1113

1214
2025-03-15 Dirk Eddelbuettel <[email protected]>
1315

inst/include/Rcpp/DottedPair.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// DottedPair.h: Rcpp R/C++ interface class library -- dotted pair list template
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
//
@@ -35,14 +35,11 @@ RCPP_API_CLASS(DottedPair_Impl),
3535
DottedPair_Impl(SEXP x) {
3636
Storage::set__(x) ;
3737
}
38-
#if defined(HAS_VARIADIC_TEMPLATES)
39-
template <typename... T>
40-
DottedPair_Impl(const T&... args) {
41-
Storage::set__(pairlist(args...));
42-
}
43-
#else
44-
#include <Rcpp/generated/DottedPair__ctors.h>
45-
#endif
38+
template <typename... T>
39+
DottedPair_Impl(const T&... args) {
40+
Storage::set__(pairlist(args...));
41+
}
42+
// RM #include <Rcpp/generated/DottedPair__ctors.h>
4643

4744
void update(SEXP){}
4845

inst/include/Rcpp/grow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// grow.h: Rcpp R/C++ interface class library -- grow a pairlist
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
//

0 commit comments

Comments
 (0)