Merge pull request #900 from RcppCore/feature/strict_headers

Feature/strict headers
RcppCore · Sep 18, 2018 · 3924240 · 3924240
2 parents 4a6cb61 + 5177165
commit 3924240
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,8 @@
 2018-09-17  Dirk Eddelbuettel  <edd@debian.org>
 
+	* inst/include/Rcpp/r/headers.h: Define STRICT_R_HEADERS, but until
+	September 2019 protect by defining RCPP_NO_STRICT_HEADERS
+
 	* .travis.yml (env): Switch to rcpp/ci for ci use
 
 2018-09-15  Dirk Eddelbuettel  <edd@debian.org>

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.12.18.2
-Date: 2018-08-27
+Version: 0.12.18.3
+Date: 2018-09-17
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
  Nathan Russell, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <edd@debian.org>

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -7,7 +7,10 @@
   \itemize{
     \item Changes in Rcpp API:
     \itemize{
-      TBD
+      \item \code{STRICT_R_HEADERS} will be defined twelve months from
+      now; until then we protect it via \code{RCPP_NO_STRICT_HEADERS}
+      which can then be used to avoid the definition; downstream
+      maintainers are encouraged to update their packages as needed
     }
     \item Changes in Rcpp Modules:
     \itemize{
@@ -19,6 +22,12 @@
       \item Several vignettes now use the \code{collapse} argument to
       show output in the corresponding code block.
     }
+    \item Changes in Rcpp Deployment:
+    \itemize{
+      \item Dockerfiles for continuous integration, standard deployment
+      and 'plus sized' deployment are provided along with builds
+      \item Travis CI now use the \code{rcpp/ci} container for tests
+    }
   }
 }
 

diff --git a/inst/include/Rcpp/r/headers.h b/inst/include/Rcpp/r/headers.h
@@ -25,6 +25,17 @@
 #define MAXELTSIZE 8192
 #define R_NO_REMAP
 
+// until September 2019, define RCPP_NO_STRICT_R_HEADERS for transition
+#ifndef RCPP_NO_STRICT_R_HEADERS
+# define RCPP_NO_STRICT_R_HEADERS
+#endif
+// define strict headers for R to not clash on ERROR, MESSGAGE, etc
+#ifndef RCPP_NO_STRICT_R_HEADERS
+# ifndef STRICT_R_HEADERS
+#  define STRICT_R_HEADERS
+# endif
+#endif
+
 // prevent some macro pollution when including R headers
 // in particular, on Linux, gcc 'leaks' the 'major',
 // 'minor' and 'makedev' macros on Linux; we prevent