Skip to content
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

Jump to bottom

Condition define of no remap #1296

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Condition define of no remap #1296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e93f4f
Protect R_NO_REMAP (and MAXELTSIZE) as needed with R 4.4.0
eddelbuettel Feb 21, 2024
a46edc9
Roll micro version and date
eddelbuettel Feb 21, 2024
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
8 changes: 8 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2024-02-21 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll micro version
* inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem

* inst/include/Rcpp/r/headers.h: Set R_NO_REMAP (and MAXELTSIZE)
only if not already defined (as will be needed with R 4.4.0)

2024-01-09 Dirk Eddelbuettel <edd@debian.org>

* README.md: Update usage numbers
Expand Down
4 changes: 2 additions & 2 deletions 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.12
Date: 2024-01-08
Version: 1.0.12.1
Date: 2024-02-21
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Expand Down
2 changes: 1 addition & 1 deletion R/Attributes.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# Copyright (C) 2012 - 2022 JJ Allaire, Dirk Eddelbuettel and Romain Francois
# Copyright (C) 2023 JJ Allaire, Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
# Copyright (C) 2023 - 2024 JJ Allaire, Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
#
# This file is part of Rcpp.
#
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RCPP_VERSION_STRING "1.0.12"

// the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
#define RCPP_DEV_VERSION RcppDevVersion(1,0,12,0)
#define RCPP_DEV_VERSION_STRING "1.0.12.0"
#define RCPP_DEV_VERSION RcppDevVersion(1,0,12,1)
#define RCPP_DEV_VERSION_STRING "1.0.12.1"

#endif
10 changes: 7 additions & 3 deletions inst/include/Rcpp/r/headers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// headers.h: Rcpp R/C++ interface class library -- R headers
//
// Copyright (C) 2008 - 2009 Dirk Eddelbuettel
// Copyright (C) 2009 - 2022 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2009 - 2024 Dirk Eddelbuettel and Romain Francois
//
// This file is part of Rcpp.
//
Expand All @@ -22,8 +22,12 @@
#define RCPP__R__HEADERS__H

// include R headers, but set R_NO_REMAP and access everything via Rf_ prefixes
#define MAXELTSIZE 8192
#define R_NO_REMAP
#ifndef MAXELTSIZE
#define MAXELTSIZE 8192
#endif
#ifndef R_NO_REMAP
#define R_NO_REMAP
#endif

// define strict headers for R to not clash on ERROR, MESSGAGE, etc
#ifndef RCPP_NO_STRICT_R_HEADERS
Expand Down
Loading