diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2018-08-08 16:57:58 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2018-08-08 16:57:58 -0700 |
| commit | 1c8b9e10a791cb43b4f730dcb5d7889099cc1c68 (patch) | |
| tree | a62a2f74c6e2bec8367a01272743260ec7f54cef /unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h | |
| parent | 1b0373ae10687ecc51ad9a0bfd46aa4ee116ade1 (diff) | |
| parent | 131ed1191fa5ccbe0265fcfccfc685642c388192 (diff) | |
Merged with upstream eigen
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h b/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h index fbe69aabc..98f125408 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h @@ -61,8 +61,8 @@ class TensorShufflingOp : public TensorBase<TensorShufflingOp<Shuffle, XprType> typedef typename Eigen::internal::traits<TensorShufflingOp>::StorageKind StorageKind; typedef typename Eigen::internal::traits<TensorShufflingOp>::Index Index; - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorShufflingOp(const XprType& expr, const Shuffle& shuffle) - : m_xpr(expr), m_shuffle(shuffle) {} + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorShufflingOp(const XprType& expr, const Shuffle& shfl) + : m_xpr(expr), m_shuffle(shfl) {} EIGEN_DEVICE_FUNC const Shuffle& shufflePermutation() const { return m_shuffle; } |