diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2017-03-15 16:48:52 +0000 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2017-03-15 16:48:52 +0000 |
| commit | 7f31bb6822f4baffaca402cf03f37499c7098a2b (patch) | |
| tree | 086ef5fe9116539824dd8934f9bf3cbe540058b2 /Eigen | |
| parent | 89fd0c38812b024734eeacf9c23ed3714c8b0f93 (diff) | |
| parent | 1c03d43a5cc421da067f12fe02db9eedaa1d125d (diff) | |
Merged in ilya-biryukov/eigen/fix_clang_cuda_compilation (pull request PR-304)
Fixed compilation with cuda-clang
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/MathFunctions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/MathFunctions.h b/Eigen/src/Core/MathFunctions.h index 7a6b999af..5ec6c395e 100644 --- a/Eigen/src/Core/MathFunctions.h +++ b/Eigen/src/Core/MathFunctions.h @@ -512,7 +512,7 @@ namespace std_fallback { template<typename Scalar> struct expm1_impl { - static inline Scalar run(const Scalar& x) + EIGEN_DEVICE_FUNC static inline Scalar run(const Scalar& x) { EIGEN_STATIC_ASSERT_NON_INTEGER(Scalar) #if EIGEN_HAS_CXX11_MATH @@ -549,7 +549,7 @@ namespace std_fallback { template<typename Scalar> struct log1p_impl { - static inline Scalar run(const Scalar& x) + EIGEN_DEVICE_FUNC static inline Scalar run(const Scalar& x) { EIGEN_STATIC_ASSERT_NON_INTEGER(Scalar) #if EIGEN_HAS_CXX11_MATH |