mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
Merged eigen/eigen into default
This commit is contained in:
@@ -38,7 +38,9 @@ struct traits<TensorEvalToOp<XprType, MakePointer_> >
|
||||
};
|
||||
template <class T>
|
||||
struct MakePointer {
|
||||
typedef typename MakePointer_<T>::Type Type;
|
||||
// Intermediate typedef to workaround MSVC issue.
|
||||
typedef MakePointer_<T> MakePointerT;
|
||||
typedef typename MakePointerT::Type Type;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -42,9 +42,10 @@ struct traits<TensorForcedEvalOp<XprType, MakePointer_> >
|
||||
enum {
|
||||
Flags = 0
|
||||
};
|
||||
template <class T>
|
||||
struct MakePointer {
|
||||
typedef typename MakePointer_<T>::Type Type;
|
||||
template <class T> struct MakePointer {
|
||||
// Intermediate typedef to workaround MSVC issue.
|
||||
typedef MakePointer_<T> MakePointerT;
|
||||
typedef typename MakePointerT::Type Type;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -80,8 +80,8 @@ struct traits<TensorFixedSize<Scalar_, Dimensions, Options_, IndexType_> >
|
||||
};
|
||||
|
||||
|
||||
template<typename PlainObjectType, int Options_ , template <class> class MakePointer_>
|
||||
struct traits<TensorMap<PlainObjectType, Options_ , MakePointer_> >
|
||||
template<typename PlainObjectType, int Options_, template <class> class MakePointer_>
|
||||
struct traits<TensorMap<PlainObjectType, Options_, MakePointer_> >
|
||||
: public traits<PlainObjectType>
|
||||
{
|
||||
typedef traits<PlainObjectType> BaseTraits;
|
||||
@@ -142,16 +142,16 @@ struct eval<const TensorFixedSize<Scalar_, Dimensions, Options, IndexType_>, Eig
|
||||
typedef const TensorFixedSize<Scalar_, Dimensions, Options, IndexType_>& type;
|
||||
};
|
||||
|
||||
template<typename PlainObjectType, int Options>
|
||||
struct eval<TensorMap<PlainObjectType, Options>, Eigen::Dense>
|
||||
template<typename PlainObjectType, int Options, template <class> class MakePointer>
|
||||
struct eval<TensorMap<PlainObjectType, Options, MakePointer>, Eigen::Dense>
|
||||
{
|
||||
typedef const TensorMap<PlainObjectType, Options>& type;
|
||||
typedef const TensorMap<PlainObjectType, Options, MakePointer>& type;
|
||||
};
|
||||
|
||||
template<typename PlainObjectType, int Options>
|
||||
struct eval<const TensorMap<PlainObjectType, Options>, Eigen::Dense>
|
||||
template<typename PlainObjectType, int Options, template <class> class MakePointer>
|
||||
struct eval<const TensorMap<PlainObjectType, Options, MakePointer>, Eigen::Dense>
|
||||
{
|
||||
typedef const TensorMap<PlainObjectType, Options>& type;
|
||||
typedef const TensorMap<PlainObjectType, Options, MakePointer>& type;
|
||||
};
|
||||
|
||||
template<typename PlainObjectType>
|
||||
@@ -197,16 +197,16 @@ struct nested<const TensorFixedSize<Scalar_, Dimensions, Options, IndexType_> >
|
||||
};
|
||||
|
||||
|
||||
template <typename PlainObjectType, int Options>
|
||||
struct nested<TensorMap<PlainObjectType, Options> >
|
||||
template <typename PlainObjectType, int Options, template <class> class MakePointer>
|
||||
struct nested<TensorMap<PlainObjectType, Options, MakePointer> >
|
||||
{
|
||||
typedef const TensorMap<PlainObjectType, Options>& type;
|
||||
typedef const TensorMap<PlainObjectType, Options, MakePointer>& type;
|
||||
};
|
||||
|
||||
template <typename PlainObjectType, int Options>
|
||||
struct nested<const TensorMap<PlainObjectType, Options> >
|
||||
template <typename PlainObjectType, int Options, template <class> class MakePointer>
|
||||
struct nested<const TensorMap<PlainObjectType, Options, MakePointer> >
|
||||
{
|
||||
typedef const TensorMap<PlainObjectType, Options>& type;
|
||||
typedef const TensorMap<PlainObjectType, Options, MakePointer>& type;
|
||||
};
|
||||
|
||||
template <typename PlainObjectType>
|
||||
|
||||
Reference in New Issue
Block a user