diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-10-20 11:37:44 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-10-20 11:37:44 -0700 |
| commit | f5c1587e4e7d9e3e5a57deedff8d27b866a0a47b (patch) | |
| tree | bd3b7f5d1eb5cb11ea7b644bd09d4dd5a60bb4ca /unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h | |
| parent | fe630c98739186c1dd3faf7a06b52a64baa5ea23 (diff) | |
Fixed a bug in the tensor conversion op
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h b/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h index 4ca978ab4..79d802ea9 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h @@ -124,8 +124,8 @@ class TensorConversionOp : public TensorBase<TensorConversionOp<TargetType, XprT typedef typename internal::traits<TensorConversionOp>::StorageKind StorageKind; typedef typename internal::traits<TensorConversionOp>::Index Index; typedef typename internal::nested<TensorConversionOp>::type Nested; - typedef typename XprType::CoeffReturnType CoeffReturnType; - typedef typename XprType::PacketReturnType PacketReturnType; + typedef Scalar CoeffReturnType; + typedef Packet PacketReturnType; typedef typename NumTraits<Scalar>::Real RealScalar; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorConversionOp(const XprType& xpr) @@ -164,6 +164,8 @@ struct TensorEvaluator<const TensorConversionOp<TargetType, ArgType>, Device> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const XprType& op, const Device& device) : m_impl(op.expression(), device) { + + EIGEN_STATIC_ASSERT((internal::is_same<Scalar, bool>::value), YOU_MADE_A_PROGRAMMING_MISTAKE); } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Dimensions& dimensions() const { return m_impl.dimensions(); } |