Skip to content

Commit

Permalink
Merge pull request #333 from DavisVaughan/rc/0-4-6
Browse files Browse the repository at this point in the history
RC 0.4.6
  • Loading branch information
DavisVaughan authored Aug 10, 2023
2 parents eb4ff54 + 09d4857 commit d24c6c7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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 = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-4777-038X")),
Expand Down
5 changes: 1 addition & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -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).
8 changes: 2 additions & 6 deletions inst/include/cpp11/R.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d24c6c7

Please sign in to comment.