devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of class internal::nested<> (still have to updated Tensor module)

Browse Source
This commit is contained in:
Gael Guennebaud
2015-06-19 17:56:39 +02:00
parent 386d9e5ebd
commit 846b227bb7
25 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h
View File

@@ -155,6 +155,11 @@ struct eval<const TensorRef<PlainObjectType>, Eigen::Dense>
typedef const TensorRef<PlainObjectType>& type;
};
// TODO nested<> does not exist anymore in Eigen/Core, and it thus has to be removed in favor of ref_selector.
template<typename T, int n=1, typename PlainObject = void> struct nested
{
typedef typename ref_selector<T>::type type;
};
template <typename Scalar_, std::size_t NumIndices_, int Options_, typename IndexType_>
struct nested<Tensor<Scalar_, NumIndices_, Options_, IndexType_> >

2
unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h
View File

@@ -400,7 +400,7 @@ template<typename Derived> struct MatrixExponentialReturnValue
Index cols() const { return m_src.cols(); }
protected:
const typename internal::nested<Derived>::type m_src;
const typename internal::ref_selector<Derived>::type m_src;
};
namespace internal {

2
unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
View File

@@ -485,7 +485,7 @@ template<typename Derived> class MatrixFunctionReturnValue
typedef typename internal::stem_function<Scalar>::type StemFunction;
protected:
typedef typename internal::nested<Derived>::type DerivedNested;
typedef typename internal::ref_selector<Derived>::type DerivedNested;
public:

2
unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h
View File

@@ -315,7 +315,7 @@ public:
typedef typename Derived::Index Index;
protected:
typedef typename internal::nested<Derived>::type DerivedNested;
typedef typename internal::ref_selector<Derived>::type DerivedNested;
public:

2
unsupported/Eigen/src/MatrixFunctions/MatrixSquareRoot.h
View File

@@ -320,7 +320,7 @@ template<typename Derived> class MatrixSquareRootReturnValue
{
protected:
typedef typename Derived::Index Index;
typedef typename internal::nested<Derived>::type DerivedNested;
typedef typename internal::ref_selector<Derived>::type DerivedNested;
public:
/** \brief Constructor.

4
unsupported/Eigen/src/Skyline/SkylineProduct.h
View File

@@ -14,8 +14,8 @@ namespace Eigen {
template<typename Lhs, typename Rhs, int ProductMode>
struct SkylineProductReturnType {
typedef const typename internal::nested<Lhs, Rhs::RowsAtCompileTime>::type LhsNested;
typedef const typename internal::nested<Rhs, Lhs::RowsAtCompileTime>::type RhsNested;
typedef const typename internal::nested_eval<Lhs, Rhs::RowsAtCompileTime>::type LhsNested;
typedef const typename internal::nested_eval<Rhs, Lhs::RowsAtCompileTime>::type RhsNested;
typedef SkylineProduct<LhsNested, RhsNested, ProductMode> Type;
};

2
unsupported/Eigen/src/SparseExtra/BlockSparseMatrix.h
View File

@@ -287,7 +287,7 @@ class BlockSparseMatrix : public SparseMatrixBase<BlockSparseMatrix<_Scalar,_Blo
typedef _Scalar Scalar;
typedef typename NumTraits<Scalar>::Real RealScalar;
typedef _StorageIndex StorageIndex;
typedef typename internal::nested<BlockSparseMatrix<_Scalar, _BlockAtCompileTime, _Options, _StorageIndex> >::type Nested;
typedef typename internal::ref_selector<BlockSparseMatrix<_Scalar, _BlockAtCompileTime, _Options, _StorageIndex> >::type Nested;
enum {
Options = _Options,