Skip to content

Commit f17ee6a

Browse files
committed
use empty RCPP_CONSTEXPR if icc is used w/ C++98
1 parent 98ecceb commit f17ee6a

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

ChangeLog

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
2017-02-01 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/include/Rcpp/algorithm.h (RCPP_CONSTEXPR): Further refinement for
4+
Intel compiler without C++11
5+
16
2017-01-31 Dirk Eddelbuettel <[email protected]>
27

3-
* DESCRIPTION (Date, Version): Roll minor version
8+
* DESCRIPTION (Date, Version): Roll minor version
49

510
* inst/include/Rcpp/algorithm.h: Allow algorithm.h to be compiler under
611
Intel's compiler, add copyright header and include guard

inst/include/Rcpp/algorithm.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
#if __cplusplus >= 201103L || __INTEL_CXX11_MODE__ == 1
2626
# define RCPP_CONSTEXPR constexpr
27+
#elif defined(__INTEL_COMPILER)
28+
# define RCPP_CONSTEXPR
2729
#else
2830
# define RCPP_CONSTEXPR const
2931
#endif

0 commit comments

Comments
 (0)