diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-03-30 14:55:54 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-03-30 14:55:54 -0700 |
| commit | 35722fa0222a7f99a8179d75244177a9801ea36b (patch) | |
| tree | 151d3b1e7dac4b322afd00f719d5e0934dd542e1 /unsupported/Eigen/CXX11/src/Tensor/TensorBase.h | |
| parent | 71950f02e573bcffa589e83f188bc64b717af1c7 (diff) | |
Made the index type a template parameter of the tensor class instead of encoding it in the options.
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorBase.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBase.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h index ca6681a1f..22fbe9b2c 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h @@ -460,8 +460,7 @@ class TensorBase<Derived, ReadOnlyAccessors> } protected: - template <typename Scalar, std::size_t NumIndices, int Options> friend class Tensor; - template <typename Scalar, int Options> friend class TensorVarDim; + template <typename Scalar, std::size_t NumIndices, int Options, typename IndexType> friend class Tensor; template <typename OtherDerived, int AccessLevel> friend class TensorBase; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Derived& derived() const { return *static_cast<const Derived*>(this); } @@ -477,8 +476,7 @@ class TensorBase<Derived, WriteAccessors> : public TensorBase<Derived, ReadOnlyA typedef typename internal::packet_traits<Scalar>::type PacketReturnType; static const int NumDimensions = DerivedTraits::NumDimensions; - template <typename Scalar, std::size_t NumIndices, int Options> friend class Tensor; - template <typename Scalar, int Options> friend class TensorVarDim; + template <typename Scalar, std::size_t NumIndices, int Options, typename IndexType> friend class Tensor; template <typename OtherDerived, int AccessLevel> friend class TensorBase; EIGEN_DEVICE_FUNC |