diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2019-03-01 14:21:09 -0800 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2019-03-01 14:21:09 -0800 |
| commit | cf4a1c81fa27ae94634ba7e86da06d6849ebc474 (patch) | |
| tree | 4ef753fd7e8bfca3b30fd9a468827a2bc81d5e8a /unsupported/Eigen/CXX11/src/Tensor/TensorBase.h | |
| parent | c181dfb8ab0a009795858670b4236d7e64a0c79e (diff) | |
Fix specialization for conjugate on non-complex types in TensorBase.h.
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorBase.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h index dd008fe05..dbacf494e 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h @@ -244,11 +244,11 @@ class TensorBase<Derived, ReadOnlyAccessors> } EIGEN_DEVICE_FUNC - EIGEN_STRONG_INLINE const typename internal::conditional<NumTraits<Scalar>::IsComplex, + EIGEN_STRONG_INLINE const typename internal::conditional<NumTraits<CoeffReturnType>::IsComplex, TensorCwiseUnaryOp<internal::scalar_conjugate_op<Scalar>, const Derived>, Derived>::type conjugate() const { - return choose(Cond<NumTraits<Scalar>::IsComplex>(), unaryExpr(internal::scalar_conjugate_op<Scalar>()), derived()); + return choose(Cond<NumTraits<CoeffReturnType>::IsComplex>(), unaryExpr(internal::scalar_conjugate_op<Scalar>()), derived()); } EIGEN_DEVICE_FUNC |