Skip to content

Commit e28121b

Browse files
committed
No longer define HAS_VARIADIC_TEMPLATES
1 parent b4f9925 commit e28121b

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
* inst/include/Rcpp/generated/Pairlist__ctors.h: Idem
3939
* inst/include/Rcpp/generated/InternalFunction__ctors.h: Idem
4040

41+
* inst/include/Rcpp/platform/compiler.h: No longer define HAS_VARIADIC_TEMPLATES
42+
* src/api.cpp (rcpp_can_use_cxx0x): Return true unconditionally
43+
4144
2025-03-15 Dirk Eddelbuettel <[email protected]>
4245

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

inst/include/Rcpp/platform/compiler.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
// C++11 features -- that used to be carefully tested for or worked around via CXX0X / TR1
3535
// These defines are all planned to get removed just how a number have already been removed. One at a time...
3636
#define RCPP_USING_CXX11
37-
#define HAS_VARIADIC_TEMPLATES
3837
#include <cmath>
3938
#include <initializer_list>
4039
#include <unordered_map>

inst/include/Rcpp/vector/Vector.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,6 @@ class Vector :
11201120
return Vector( 0 ) ;
11211121
}
11221122

1123-
// #if defined(HAS_VARIADIC_TEMPLATES)
11241123
public:
11251124
template <typename... T>
11261125
static Vector create(const T&... t){

src/api.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,7 @@ SEXP rcpp_capabilities() {
223223

224224
// [[Rcpp::internal]]
225225
SEXP rcpp_can_use_cxx0x() { // #nocov start
226-
#if defined(HAS_VARIADIC_TEMPLATES)
227-
return Rf_ScalarLogical(TRUE);
228-
#else
229-
return Rf_ScalarLogical(FALSE);
230-
#endif
226+
return Rf_ScalarLogical(TRUE);
231227
}
232228

233229

@@ -240,7 +236,6 @@ SEXP rcpp_can_use_cxx11() {
240236
#endif
241237
}
242238

243-
244239
// [[Rcpp::register]]
245240
SEXP stack_trace(const char* file, int line) {
246241
return R_NilValue;

0 commit comments

Comments
 (0)