diff --git a/ChangeLog b/ChangeLog index ab1ecef36..ee9922874 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2025-01-01 Dirk Eddelbuettel + + * inst/include/Rcpp/Benchmark/Timer.h (R_NO_REMAP): Protect include + with preceding #ifndef now that R 4.5.0 will set this too + 2024-11-25 Dirk Eddelbuettel * DESCRIPTION (Version, Date): Roll micro version to 1.0.13.6 diff --git a/DESCRIPTION b/DESCRIPTION index 1eec8dc2d..572573910 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: Rcpp Title: Seamless R and C++ Integration Version: 1.0.13.6 -Date: 2024-11-25 +Date: 2025-01-01 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org", comment = c(ORCID = "0000-0001-6419-907X")), person("Romain", "Francois", role = "aut", diff --git a/inst/include/Rcpp/Benchmark/Timer.h b/inst/include/Rcpp/Benchmark/Timer.h index d8e3ea735..5dab598ac 100644 --- a/inst/include/Rcpp/Benchmark/Timer.h +++ b/inst/include/Rcpp/Benchmark/Timer.h @@ -1,8 +1,6 @@ -// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*- -// // Timer.h: Rcpp R/C++ interface class library -- Rcpp benchmark utility // -// Copyright (C) 2012 - 2014 JJ Allaire, Dirk Eddelbuettel and Romain Francois +// Copyright (C) 2012 - 2025 JJ Allaire, Dirk Eddelbuettel and Romain Francois // // This file is part of Rcpp. // @@ -26,7 +24,9 @@ #include #include -#define R_NO_REMAP +#ifndef R_NO_REMAP + #define R_NO_REMAP +#endif #include #if defined(_WIN32)