Skip to content

Commit af96e43

Browse files
committed
Reflect code review comments
1 parent 8c25cf9 commit af96e43

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

inst/include/Rcpp/platform/compiler.h

+4-9
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,17 @@
2222

2323
// NB: A vast list valid identifiers is at these wiki pages:
2424
// http://sourceforge.net/p/predef/wiki/Home/
25-
#if defined(__GNUC__) || defined(__SUNPRO_CC) || defined(__clang__) || defined(__INTEL_COMPILER)
26-
#define GOOD_COMPILER_FOR_RCPP
27-
#else
25+
#if !defined(__GNUC__) && !defined(__SUNPRO_CC) && !defined(__clang__) && !defined(__INTEL_COMPILER)
2826
#error "This compiler is not supported"
2927
#endif
3028

31-
// New simpler test and minimal standard: C++11 or else we die
29+
// Simpler test and minimal standard: C++11 or else we die
3230
#if __cplusplus < 201103L
3331
#error "The C++ compilation standard is too old: use C++11 or newer."
3432
#endif
3533

36-
#ifdef __GNUC__
37-
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
38-
#endif
39-
4034
// C++11 features -- that used to be carefully tested for or worked around via CXX0X / TR1
35+
// These defines are all planned to get removed just how a number have already been removed. One at a time...
4136
#define RCPP_USING_CXX11
4237
#define HAS_VARIADIC_TEMPLATES
4338
#include <cmath>
@@ -49,7 +44,7 @@
4944
#define RCPP_USING_UNORDERED_SET
5045
#define RCPP_UNORDERED_SET std::unordered_set
5146

52-
#ifdef __GNUC__
47+
#if defined(__GNUC__)
5348
#define RCPP_HAS_DEMANGLING
5449
#endif
5550

man/evalCpp.Rd

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ evalCpp("__cplusplus")
6262
evalCpp("std::numeric_limits<double>::max()")
6363

6464
# areMacrosDefined is no longer exported but accessible via ':::'
65-
Rcpp:::areMacrosDefined(c("__cplusplus", "GCC_VERSION"))
65+
Rcpp:::areMacrosDefined(c("__cplusplus", "RCPP_VERSION"))
6666

6767
}
6868
}

0 commit comments

Comments
 (0)