make _R_CXX_USE_NO_REMAP_ the default

git-svn-id: https://svn.r-project.org/R/trunk@87314 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

doc/NEWS.Rd

@@ -256,15 +256,21 @@
 
   \subsection{UTILITIES}{
     \itemize{
-      \item \command{R CMD check --as-cran} will compile C++ code with
-      \code{-DR_NO_REMAP}.
+      \item \command{R CMD INSTALL} (and hence \command{check}) now by
+      default compile C++ code with \code{-DR_NO_REMAP}.  For the time
+      being this can be reverted by setting environment
+      variable\env{_R_CXX_USE_NO_REMAP_} to a false value (but that will
+      be removed in the near future).
+      
+%%      \item \command{R CMD check --as-cran} will compile C++ code with
+%%      \code{-DR_NO_REMAP}.
 
       \item \command{R CMD check --as-cran} notes bad parts in the
       \file{DESCRIPTION} file's URL fields.
 
-      \item Installation will define \code{STRICT_R_HEADERS} if
-      environment variable \env{_R_USE_STRICT_R_HEADERS_} is set to a
-      true value: this is done by \command{R CMD check --as-cran}.
+%%      \item Installation will define \code{STRICT_R_HEADERS} if
+%%     environment variable \env{_R_USE_STRICT_R_HEADERS_} is set to a
+%%      true value: this is done by \command{R CMD check --as-cran}.
 
       \item \command{R CMD check} now reports more warnings on
       long-deprecated/obsolete Fortran features from

doc/manual/R-exts.texi

@@ -17080,12 +17080,13 @@ use.
 Let us re-iterate the advice to include in C++ code system headers
 before the @R{} header files, especially @file{Rinternals.h} (included
 by @file{Rdefines.h}) and @file{Rmath.h}, which redefine names which may
-be used in system headers, or (preferably) to define @code{R_NO_REMAP}.
-Setting the environment variable @env{_R_CXX_USE_NO_REMAP_} to a true value
-allows the need for this to be tested, as it causes @command{R CMD
-INSTALL} to compile C++ code defining @code{R_NO_REMAP}.
-@env{_R_CXX_USE_NO_REMAP_} is set by @command{R CMD check --as-cran} and
-is planned to become the default in future.
+be used in system headers, or (preferably and now the default) to define
+@code{R_NO_REMAP}.
+@c Setting the environment variable @env{_R_CXX_USE_NO_REMAP_} to a true value
+@c allows the need for this to be tested, as it causes @command{R CMD
+@c INSTALL} to compile C++ code defining @code{R_NO_REMAP}.
+@c @env{_R_CXX_USE_NO_REMAP_} is set by @command{R CMD check --as-cran} and
+@c is planned to become the default in future.
 
 
 @node Moving into C API compliance

src/library/tools/R/check.R

@@ -7296,7 +7296,8 @@ add_dummies <- function(dir, Log)
         Sys.setenv("_R_CHECK_RD_NOTE_LOST_BRACES_" = "TRUE")
         Sys.setenv("_R_CHECK_MBCS_CONVERSION_FAILURE_" = "TRUE")
         Sys.setenv("_R_CHECK_VALIDATE_UTF8_" = "TRUE")
-        Sys.setenv("_R_CXX_USE_NO_REMAP_" = "TRUE")
+## next two are the defailt as from R 4.5.0
+##        Sys.setenv("_R_CXX_USE_NO_REMAP_" = "TRUE")
 ##        Sys.setenv("_R_USE_STRICT_R_HEADERS_" = "TRUE")
         Sys.setenv("_R_CHECK_S3_METHODS_SHOW_POSSIBLE_ISSUES_" = "TRUE")
         Sys.setenv("_R_CHECK_XREFS_NOTE_MISSING_PACKAGE_ANCHORS_" = "TRUE")

src/library/tools/R/install.R

@@ -2762,7 +2762,7 @@ if(FALSE) {
                         paste0("LTO_FC=", shQuote("$(LTO_FC_OPT)")))
                   else if(isFALSE(use_lto)) c("LTO=", "LTO_FC=")
                   )
-    if(config_val_to_logical(Sys.getenv("_R_CXX_USE_NO_REMAP_", "FALSE")))
+    if(config_val_to_logical(Sys.getenv("_R_CXX_USE_NO_REMAP_", "TRUE")))
          makeargs <- c(makeargs, "CXX_DEFS=-DR_NO_REMAP")
 ##    if(config_val_to_logical(Sys.getenv("_R_USE_STRICT_R_HEADERS_", "FALSE")))
 ##         makeargs <- c(makeargs, "XDEFS=-DSTRICT_R_HEADERS=1")