Skip to content

Commit d24c6c7

Browse files
authored
Merge pull request #333 from DavisVaughan/rc/0-4-6
RC 0.4.6
2 parents eb4ff54 + 09d4857 commit d24c6c7

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: cpp11
22
Title: A C++11 Interface for R's C Interface
3-
Version: 0.4.5.9000
3+
Version: 0.4.6
44
Authors@R:
55
c(
66
person("Davis", "Vaughan", email = "davis@posit.co", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-4777-038X")),

NEWS.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cpp11 (development version)
1+
# cpp11 0.4.6
22

33
* R >=3.5.0 is now required to use cpp11. This is in line with (and even goes
44
beyond) the tidyverse standard of supporting the previous 5 minor releases of
@@ -43,9 +43,6 @@
4343

4444
* Minor performance improvements to the cpp11 protect code. (@kevinushey)
4545

46-
* Silenced an unknown attribute warning specific to the Intel compiler
47-
(r-lib/systemfonts#98).
48-
4946
* `cpp_register()` gains an argument `extension=` governing the file extension of
5047
the `src/cpp11` file. By default it's `.cpp`, but `.cc` is now supported
5148
as well (#292, @MichaelChirico)

cran-comments.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Patch release to fix a bug in 0.4.4 that caused CRAN to revert the package back
2+
to 0.4.3 code (under a version of 0.4.5).

inst/include/cpp11/R.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,12 @@
1313
#include "Rinternals.h"
1414

1515
// clang-format off
16-
#if defined(__INTEL_COMPILER)
17-
# pragma warning(disable : 3924)
18-
#endif
19-
20-
#if defined(__clang__)
16+
#ifdef __clang__
2117
# pragma clang diagnostic push
2218
# pragma clang diagnostic ignored "-Wattributes"
2319
#endif
2420

25-
#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
21+
#ifdef __GNUC__
2622
# pragma GCC diagnostic push
2723
# pragma GCC diagnostic ignored "-Wattributes"
2824
#endif

0 commit comments

Comments
 (0)