Skip to content

Commit ab90134

Browse files
author
ripley
committed
tweaks, including centralizing list of C++ standards
git-svn-id: https://svn.r-project.org/R/trunk@89279 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent f9e9703 commit ab90134

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

doc/NEWS.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@
519519
\file{src/Makevars*} and in the \code{SystemRequirements} field of
520520
the \file{DESCRIPTION} file) are now checked more thoroughly.
521521
Invalid values are still ignored but now give a warning, as do
522-
contradicting specifications.
522+
contradictory specifications.
523523
}
524524
}
525525

src/library/tools/R/check.R

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6557,9 +6557,13 @@ add_dummies <- function(dir, Log)
65576557
if (length(line)) {
65586558
checkingLog(Log, "C++ specification")
65596559
std <- as.numeric(sub("specified C[+][+]", "", line))
6560-
if (!(std %in% c("17", "20", "23", "26")))
6560+
if ((std %in% c("98", "11", "14")))
65616561
noteLog(Log,
6562-
sprintf(" Unknown/obsolate C++%d standard request will be ignored", std))
6562+
sprintf(" Obsolete C++%d standard request will be ignored", std))
6563+
## cxx_standards is set in install.R
6564+
else if (!(std %in% cxx_standards))
6565+
noteLog(Log,
6566+
sprintf(" Unknown C++%d standard request will be ignored", std))
65636567
## since R 4.4.0 C++17 support is required, but
65646568
## C++23/26 support is patchy
65656569
else if (std >= 23) {

0 commit comments

Comments
 (0)