From 219f5b8b3c5873d155ab07f706afe69cca7ebf26 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 4 Aug 2023 11:08:21 -0400 Subject: [PATCH 1/5] Update `cran-comments.md` --- cran-comments.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cran-comments.md b/cran-comments.md index e69de29b..38e3b8d6 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -0,0 +1,2 @@ +Patch release to fix a bug in 0.4.4 that caused CRAN to revert the package back +to 0.4.3 code (under a version of 0.4.5). From 5429caf37d5fe62f0bb0664afe62dda4f1d478f2 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 4 Aug 2023 11:09:19 -0400 Subject: [PATCH 2/5] Increment version number to 0.4.6 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index e0ead8d9..0586e17f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: cpp11 Title: A C++11 Interface for R's C Interface -Version: 0.4.5.9000 +Version: 0.4.6 Authors@R: c( person("Davis", "Vaughan", email = "davis@posit.co", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-4777-038X")), diff --git a/NEWS.md b/NEWS.md index 963a07a2..dc4ef86a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# cpp11 (development version) +# cpp11 0.4.6 * R >=3.5.0 is now required to use cpp11. This is in line with (and even goes beyond) the tidyverse standard of supporting the previous 5 minor releases of From 0b25cdac5da452b3550aa01c04e76d7327497fe4 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Mon, 7 Aug 2023 10:18:55 -0400 Subject: [PATCH 3/5] Reverts #278 CRAN advised that we revert this since the "Classic" intel compiler this was intended to support is deprecated and will be removed in 2023. It also did not even really help the original issue (https://github.com/r-lib/systemfonts/issues/98) since there were other compilation errors there. Since this is such an old system and we have only ever had 1 report about this, I feel fine reverting it back. --- NEWS.md | 3 --- inst/include/cpp11/R.hpp | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/NEWS.md b/NEWS.md index dc4ef86a..9bf5979d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -43,9 +43,6 @@ * Minor performance improvements to the cpp11 protect code. (@kevinushey) -* Silenced an unknown attribute warning specific to the Intel compiler - (r-lib/systemfonts#98). - * `cpp_register()` gains an argument `extension=` governing the file extension of the `src/cpp11` file. By default it's `.cpp`, but `.cc` is now supported as well (#292, @MichaelChirico) diff --git a/inst/include/cpp11/R.hpp b/inst/include/cpp11/R.hpp index 4c2c4fa3..8d6751f1 100644 --- a/inst/include/cpp11/R.hpp +++ b/inst/include/cpp11/R.hpp @@ -13,16 +13,12 @@ #include "Rinternals.h" // clang-format off -#if defined(__INTEL_COMPILER) -# pragma warning(disable : 3924) -#endif - -#if defined(__clang__) +#ifdef __clang__ # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wattributes" #endif -#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) +#ifdef __GNUC__ # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wattributes" #endif From a3592c027474ac9214f4924ac811f66655e554b7 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Tue, 8 Aug 2023 17:28:38 -0400 Subject: [PATCH 4/5] CRAN-SUBMISSION --- CRAN-SUBMISSION | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 CRAN-SUBMISSION diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION new file mode 100644 index 00000000..e553381b --- /dev/null +++ b/CRAN-SUBMISSION @@ -0,0 +1,3 @@ +Version: 0.4.6 +Date: 2023-08-08 21:28:27 UTC +SHA: 0b25cdac5da452b3550aa01c04e76d7327497fe4 From 09d485719b7fbb741d11eb79f41a2e3e17311cb6 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Thu, 10 Aug 2023 09:55:16 -0400 Subject: [PATCH 5/5] Delete CRAN-SUBMISSION --- CRAN-SUBMISSION | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 CRAN-SUBMISSION diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION deleted file mode 100644 index e553381b..00000000 --- a/CRAN-SUBMISSION +++ /dev/null @@ -1,3 +0,0 @@ -Version: 0.4.6 -Date: 2023-08-08 21:28:27 UTC -SHA: 0b25cdac5da452b3550aa01c04e76d7327497fe4