diff options
| author | Miao Wang <miaowang@google.com> | 2017-07-06 22:33:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 22:33:01 +0000 |
| commit | 2468c2ff45d4443b07440c4063f5f1cabe4da65a (patch) | |
| tree | 28a6fbea7c5a1e9a0f1a209f8d33e6d72f1df851 /Eigen/src/Core/ArrayBase.h | |
| parent | 457e53bce95b3700e984cffd2ef8cfba1789ec6d (diff) | |
| parent | 63687fa8cbebcbae3d0a48a6c5d63677ffa6160e (diff) | |
| download | eigen-2468c2ff45d4443b07440c4063f5f1cabe4da65a.tar.gz | |
Merge "Rebase Eigen to 3.3.4" am: c905f05b1b
am: 63687fa8cb
Change-Id: Id4ec05eaa5243187830cb5826b13b94ffcff64ba
Diffstat (limited to 'Eigen/src/Core/ArrayBase.h')
| -rw-r--r-- | Eigen/src/Core/ArrayBase.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/ArrayBase.h b/Eigen/src/Core/ArrayBase.h index f0232f65e..3dbc7084c 100644 --- a/Eigen/src/Core/ArrayBase.h +++ b/Eigen/src/Core/ArrayBase.h @@ -175,7 +175,7 @@ template<typename Derived> class ArrayBase */ template<typename Derived> template<typename OtherDerived> -EIGEN_STRONG_INLINE Derived & +EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived & ArrayBase<Derived>::operator-=(const ArrayBase<OtherDerived> &other) { call_assignment(derived(), other.derived(), internal::sub_assign_op<Scalar,typename OtherDerived::Scalar>()); @@ -188,7 +188,7 @@ ArrayBase<Derived>::operator-=(const ArrayBase<OtherDerived> &other) */ template<typename Derived> template<typename OtherDerived> -EIGEN_STRONG_INLINE Derived & +EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived & ArrayBase<Derived>::operator+=(const ArrayBase<OtherDerived>& other) { call_assignment(derived(), other.derived(), internal::add_assign_op<Scalar,typename OtherDerived::Scalar>()); @@ -201,7 +201,7 @@ ArrayBase<Derived>::operator+=(const ArrayBase<OtherDerived>& other) */ template<typename Derived> template<typename OtherDerived> -EIGEN_STRONG_INLINE Derived & +EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived & ArrayBase<Derived>::operator*=(const ArrayBase<OtherDerived>& other) { call_assignment(derived(), other.derived(), internal::mul_assign_op<Scalar,typename OtherDerived::Scalar>()); @@ -214,7 +214,7 @@ ArrayBase<Derived>::operator*=(const ArrayBase<OtherDerived>& other) */ template<typename Derived> template<typename OtherDerived> -EIGEN_STRONG_INLINE Derived & +EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived & ArrayBase<Derived>::operator/=(const ArrayBase<OtherDerived>& other) { call_assignment(derived(), other.derived(), internal::div_assign_op<Scalar,typename OtherDerived::Scalar>()); |