Skip to content

Commit 52839b0

Browse files
authored
Protect another R_NO_REMAP with preceding #ifndef (#1353)
1 parent 0c749db commit 52839b0

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2025-01-01 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/include/Rcpp/Benchmark/Timer.h (R_NO_REMAP): Protect include
4+
with preceding #ifndef now that R 4.5.0 will set this too
5+
16
2024-11-25 Dirk Eddelbuettel <[email protected]>
27

38
* DESCRIPTION (Version, Date): Roll micro version to 1.0.13.6

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
33
Version: 1.0.13.6
4-
Date: 2024-11-25
4+
Date: 2025-01-01
55
Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
66
comment = c(ORCID = "0000-0001-6419-907X")),
77
person("Romain", "Francois", role = "aut",

inst/include/Rcpp/Benchmark/Timer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
2-
//
31
// Timer.h: Rcpp R/C++ interface class library -- Rcpp benchmark utility
42
//
5-
// Copyright (C) 2012 - 2014 JJ Allaire, Dirk Eddelbuettel and Romain Francois
3+
// Copyright (C) 2012 - 2025 JJ Allaire, Dirk Eddelbuettel and Romain Francois
64
//
75
// This file is part of Rcpp.
86
//
@@ -26,7 +24,9 @@
2624
#include <vector>
2725
#include <string>
2826

29-
#define R_NO_REMAP
27+
#ifndef R_NO_REMAP
28+
#define R_NO_REMAP
29+
#endif
3030
#include <Rinternals.h>
3131

3232
#if defined(_WIN32)

0 commit comments

Comments
 (0)