Skip to content

Protect another R_NO_REMAP with preceding #ifndef #1353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 1, 2025
Merged

Protect another R_NO_REMAP with preceding #ifndef #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2025-01-01 Dirk Eddelbuettel <[email protected]>

* 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 <[email protected]>

* DESCRIPTION (Version, Date): Roll micro version to 1.0.13.6
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = "[email protected]",
comment = c(ORCID = "0000-0001-6419-907X")),
person("Romain", "Francois", role = "aut",
Expand Down
8 changes: 4 additions & 4 deletions inst/include/Rcpp/Benchmark/Timer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
//
Expand All @@ -26,7 +24,9 @@
#include <vector>
#include <string>

#define R_NO_REMAP
#ifndef R_NO_REMAP
#define R_NO_REMAP
#endif
#include <Rinternals.h>

#if defined(_WIN32)
Expand Down
Loading