Skip to content

Commit 0b25cda

Browse files
committed
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 (r-lib/systemfonts#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.
1 parent 5429caf commit 0b25cda

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

NEWS.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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)

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)