diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-06 05:25:03 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-06 05:25:03 -0800 |
| commit | c739102ef9a52fcb194dcc77f785aa55879987e4 (patch) | |
| tree | 22d19d1df4cb20baea532fa1ce13208329ff53e3 /unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h | |
| parent | 2559fa9b0f20ea138cfb019d441ad1757221568d (diff) | |
| parent | a8f2c6eec788c5cccc6beb9b5837544ea98a7154 (diff) | |
Pulled the latest changes from the trunk
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h index 022d20360..a844a4d68 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h @@ -157,50 +157,50 @@ struct eval<const TensorRef<PlainObjectType>, Eigen::Dense> template <typename Scalar_, std::size_t NumIndices_, int Options_> -struct nested<Tensor<Scalar_, NumIndices_, Options_>, 1, typename eval<Tensor<Scalar_, NumIndices_, Options_> >::type> +struct nested<Tensor<Scalar_, NumIndices_, Options_> > { typedef const Tensor<Scalar_, NumIndices_, Options_>& type; }; template <typename Scalar_, std::size_t NumIndices_, int Options_> -struct nested<const Tensor<Scalar_, NumIndices_, Options_>, 1, typename eval<const Tensor<Scalar_, NumIndices_, Options_> >::type> +struct nested<const Tensor<Scalar_, NumIndices_, Options_> > { typedef const Tensor<Scalar_, NumIndices_, Options_>& type; }; template <typename Scalar_, typename Dimensions, int Options> -struct nested<TensorFixedSize<Scalar_, Dimensions, Options>, 1, typename eval<TensorFixedSize<Scalar_, Dimensions, Options> >::type> +struct nested<TensorFixedSize<Scalar_, Dimensions, Options> > { typedef const TensorFixedSize<Scalar_, Dimensions, Options>& type; }; template <typename Scalar_, typename Dimensions, int Options> -struct nested<const TensorFixedSize<Scalar_, Dimensions, Options>, 1, typename eval<const TensorFixedSize<Scalar_, Dimensions, Options> >::type> +struct nested<const TensorFixedSize<Scalar_, Dimensions, Options> > { typedef const TensorFixedSize<Scalar_, Dimensions, Options>& type; }; template <typename PlainObjectType, int Options> -struct nested<TensorMap<PlainObjectType, Options>, 1, typename eval<TensorMap<PlainObjectType, Options> >::type> +struct nested<TensorMap<PlainObjectType, Options> > { typedef const TensorMap<PlainObjectType, Options>& type; }; template <typename PlainObjectType, int Options> -struct nested<const TensorMap<PlainObjectType, Options>, 1, typename eval<TensorMap<PlainObjectType, Options> >::type> +struct nested<const TensorMap<PlainObjectType, Options> > { typedef const TensorMap<PlainObjectType, Options>& type; }; template <typename PlainObjectType> -struct nested<TensorRef<PlainObjectType>, 1, typename eval<TensorRef<PlainObjectType> >::type> +struct nested<TensorRef<PlainObjectType> > { typedef const TensorRef<PlainObjectType>& type; }; template <typename PlainObjectType> -struct nested<const TensorRef<PlainObjectType>, 1, typename eval<TensorRef<PlainObjectType> >::type> +struct nested<const TensorRef<PlainObjectType> > { typedef const TensorRef<PlainObjectType>& type; }; |