diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2018-08-01 15:55:46 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2018-08-01 15:55:46 -0700 |
| commit | 1b0373ae10687ecc51ad9a0bfd46aa4ee116ade1 (patch) | |
| tree | 39740a2ffa119168815bd7e59fde5b2d7e9aac2d /unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h | |
| parent | 64abdf1d7eb17174f571751346dd0cbadcf3bc52 (diff) | |
Replace all using declarations with typedefs in Tensor ops
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h index 6ddded0bd..d5b0c1237 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h @@ -123,11 +123,15 @@ struct TensorEvaluator<const TensorReshapingOp<NewDimensions, ArgType>, Device> RawAccess = TensorEvaluator<ArgType, Device>::RawAccess }; - using ScalarNoConst = typename internal::remove_const<Scalar>::type; + typedef typename internal::remove_const<Scalar>::type ScalarNoConst; - using InputTensorBlock = internal::TensorBlock<ScalarNoConst, Index, NumInputDims, Layout>; - using OutputTensorBlock = internal::TensorBlock<ScalarNoConst, Index, NumOutputDims, Layout>; - using OutputTensorBlockReader = internal::TensorBlockReader<ScalarNoConst, Index, NumOutputDims, Layout>; + typedef internal::TensorBlock<ScalarNoConst, Index, NumInputDims, Layout> + InputTensorBlock; + typedef internal::TensorBlock<ScalarNoConst, Index, NumOutputDims, Layout> + OutputTensorBlock; + typedef internal::TensorBlockReader<ScalarNoConst, Index, NumOutputDims, + Layout> + OutputTensorBlockReader; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const XprType& op, const Device& device) : m_impl(op.expression(), device), m_dimensions(op.dimensions()) @@ -512,9 +516,10 @@ struct TensorEvaluator<const TensorSlicingOp<StartIndices, Sizes, ArgType>, Devi RawAccess = false }; - using ScalarNoConst = typename internal::remove_const<Scalar>::type; + typedef typename internal::remove_const<Scalar>::type ScalarNoConst; - using TensorBlock = internal::TensorBlock<ScalarNoConst, Index, NumDims, Layout>; + typedef internal::TensorBlock<ScalarNoConst, Index, NumDims, Layout> + TensorBlock; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const XprType& op, const Device& device) : m_impl(op.expression(), device), m_device(device), m_dimensions(op.sizes()), m_offsets(op.startIndices()) @@ -787,9 +792,10 @@ struct TensorEvaluator<TensorSlicingOp<StartIndices, Sizes, ArgType>, Device> RawAccess = (NumDims == 1) & TensorEvaluator<ArgType, Device>::RawAccess }; - using ScalarNoConst = typename internal::remove_const<Scalar>::type; + typedef typename internal::remove_const<Scalar>::type ScalarNoConst; - using TensorBlock = internal::TensorBlock<ScalarNoConst, Index, NumDims, Layout>; + typedef internal::TensorBlock<ScalarNoConst, Index, NumDims, Layout> + TensorBlock; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const XprType& op, const Device& device) : Base(op, device) |