Skip to content

Commit d934b12

Browse files
committed
reapplied #ifdef to use long long only under C++11
1 parent 3e02a03 commit d934b12

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

ChangeLog

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
2018-02-05 Dirk Eddelbuettel <edd@debian.org>
2+
3+
* inst/include/Eigen/src/Core/arch/CUDA/Half.h (Eigen): Condition use
4+
of long long and unsigned long on C++11
5+
16
2018-02-04 Yixuan Qiu <yixuan.qiu@cos.name>
27

38
[ In RcppEigen 0.3.3.* branch ]
4-
59
* inst/include/Eigen: Updated to the upstream 3.3 branch of Eigen
610
based on version 3.3.4
711
* inst/include/unsupported: Idem

inst/include/Eigen/src/Core/arch/CUDA/Half.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,14 @@ struct half : public half_impl::half_base {
116116
EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(long) const {
117117
return static_cast<long>(half_impl::half_to_float(*this));
118118
}
119+
#if EIGEN_HAS_CXX11
119120
EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(unsigned long) const {
120121
return static_cast<unsigned long>(half_impl::half_to_float(*this));
121122
}
122123
EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(long long) const {
123124
return static_cast<long long>(half_impl::half_to_float(*this));
124125
}
126+
#endif
125127
EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(unsigned long long) const {
126128
return static_cast<unsigned long long>(half_to_float(*this));
127129
}

0 commit comments

Comments
 (0)