diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-07 11:04:16 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-07 11:04:16 -0700 |
| commit | 5c68051cd7941a83de4c9dcc18a437e4a800ed12 (patch) | |
| tree | b67f1cbab955c89c71ba580002c7f6b3675e5449 /unsupported/Eigen/CXX11/src/Tensor/TensorFixedSize.h | |
| parent | d485d12c51bc46286f7439377e3ab591f67ddbbf (diff) | |
| parent | d7f9679a34ef991fa3c9da8f61510d6c48aaa19c (diff) | |
Merge the content of the ComputeCpp branch into the default branch
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorFixedSize.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorFixedSize.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorFixedSize.h b/unsupported/Eigen/CXX11/src/Tensor/TensorFixedSize.h index fcee5f60d..415e459b9 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorFixedSize.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorFixedSize.h @@ -23,8 +23,8 @@ namespace Eigen { * Eigen::TensorFixedSize<float, Size<3,5,7>> t; */ -template<typename Scalar_, typename Dimensions_, int Options_, typename IndexType> -class TensorFixedSize : public TensorBase<TensorFixedSize<Scalar_, Dimensions_, Options_, IndexType> > +template<typename Scalar_, typename Dimensions_, int Options_, typename IndexType, template <class> class MakePointer_> +class TensorFixedSize : public TensorBase<TensorFixedSize<Scalar_, Dimensions_, Options_, IndexType, MakePointer_> > { public: typedef TensorFixedSize<Scalar_, Dimensions_, Options_, IndexType> Self; |