File tree 2 files changed +5
-10
lines changed
inst/include/Rcpp/platform
2 files changed +5
-10
lines changed Original file line number Diff line number Diff line change 22
22
23
23
// NB: A vast list valid identifiers is at these wiki pages:
24
24
// 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)
28
26
#error "This compiler is not supported"
29
27
#endif
30
28
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
32
30
#if __cplusplus < 201103L
33
31
#error "The C++ compilation standard is too old: use C++11 or newer."
34
32
#endif
35
33
36
- #ifdef __GNUC__
37
- #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
38
- #endif
39
-
40
34
// 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...
41
36
#define RCPP_USING_CXX11
42
37
#define HAS_VARIADIC_TEMPLATES
43
38
#include < cmath>
49
44
#define RCPP_USING_UNORDERED_SET
50
45
#define RCPP_UNORDERED_SET std::unordered_set
51
46
52
- #ifdef __GNUC__
47
+ #if defined( __GNUC__)
53
48
#define RCPP_HAS_DEMANGLING
54
49
#endif
55
50
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ evalCpp("__cplusplus")
62
62
evalCpp(" std::numeric_limits<double>::max()" )
63
63
64
64
# areMacrosDefined is no longer exported but accessible via ':::'
65
- Rcpp ::: areMacrosDefined(c(" __cplusplus" , " GCC_VERSION " ))
65
+ Rcpp ::: areMacrosDefined(c(" __cplusplus" , " RCPP_VERSION " ))
66
66
67
67
}
68
68
}
You can’t perform that action at this time.
0 commit comments