diff options
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h index b7597b3a5..b540b722e 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h @@ -28,7 +28,7 @@ class compute_tensor_flags #else 0 #endif - || + | #if EIGEN_MAX_ALIGN_BYTES>0 is_dynamic_size_storage #else @@ -56,11 +56,14 @@ struct traits<Tensor<Scalar_, NumIndices_, Options_, IndexType_> > Options = Options_, Flags = compute_tensor_flags<Scalar_, Options_>::ret | (is_const<Scalar_>::value ? 0 : LvalueBit) }; + template<class T> struct MakePointer{ + typedef T* Type; + }; }; -template<typename Scalar_, typename Dimensions, int Options_, typename IndexType_> -struct traits<TensorFixedSize<Scalar_, Dimensions, Options_, IndexType_> > +template<typename Scalar_, typename Dimensions, int Options_, typename IndexType_, template <class> class MakePointer_> +struct traits<TensorFixedSize<Scalar_, Dimensions, Options_, IndexType_, MakePointer_> > { typedef Scalar_ Scalar; typedef Dense StorageKind; @@ -71,11 +74,14 @@ struct traits<TensorFixedSize<Scalar_, Dimensions, Options_, IndexType_> > Options = Options_, Flags = compute_tensor_flags<Scalar_, Options_>::ret | (is_const<Scalar_>::value ? 0: LvalueBit) }; + template<class T> struct MakePointer{ + typedef typename MakePointer_<T>::Type Type; + }; }; -template<typename PlainObjectType, int Options_> -struct traits<TensorMap<PlainObjectType, Options_> > +template<typename PlainObjectType, int Options_ , template <class> class MakePointer_> +struct traits<TensorMap<PlainObjectType, Options_ , MakePointer_> > : public traits<PlainObjectType> { typedef traits<PlainObjectType> BaseTraits; @@ -88,6 +94,9 @@ struct traits<TensorMap<PlainObjectType, Options_> > Options = Options_, Flags = BaseTraits::Flags }; + template<class T> struct MakePointer{ + typedef typename MakePointer_<T>::Type Type; + }; }; template<typename PlainObjectType> |