diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-07-02 09:35:37 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-07-02 09:35:37 +0200 |
| commit | 61b88d2feb8f23d1ba122f2c9a73abb183ebb25d (patch) | |
| tree | da8fbb7e88c6668bbf4b63e2c988697d95f9f2de /Eigen/src/Core/Map.h | |
| parent | 8f4cdbbc8f9b2214b906412701722a150cba3460 (diff) | |
| parent | bf334b8ae51725754f525c2ffcfbd83ffc55ff2e (diff) | |
merge with default branch
Diffstat (limited to 'Eigen/src/Core/Map.h')
| -rw-r--r-- | Eigen/src/Core/Map.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/Eigen/src/Core/Map.h b/Eigen/src/Core/Map.h index 6b2d61909..7dfdc3d59 100644 --- a/Eigen/src/Core/Map.h +++ b/Eigen/src/Core/Map.h @@ -115,14 +115,9 @@ template<typename PlainObjectType, int MapOptions, typename StrideType> class Ma EIGEN_DENSE_PUBLIC_INTERFACE(Map) typedef typename Base::PointerType PointerType; -#if EIGEN2_SUPPORT_STAGE <= STAGE30_FULL_EIGEN3_API - typedef const Scalar* PointerArgType; - inline PointerType cast_to_pointer_type(PointerArgType ptr) { return const_cast<PointerType>(ptr); } -#else typedef PointerType PointerArgType; EIGEN_DEVICE_FUNC inline PointerType cast_to_pointer_type(PointerArgType ptr) { return ptr; } -#endif EIGEN_DEVICE_FUNC inline Index innerStride() const @@ -184,19 +179,6 @@ template<typename PlainObjectType, int MapOptions, typename StrideType> class Ma StrideType m_stride; }; -template<typename _Scalar, int _Rows, int _Cols, int _Options, int _MaxRows, int _MaxCols> -inline Array<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols> - ::Array(const Scalar *data) -{ - this->_set_noalias(Eigen::Map<const Array>(data)); -} - -template<typename _Scalar, int _Rows, int _Cols, int _Options, int _MaxRows, int _MaxCols> -inline Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols> - ::Matrix(const Scalar *data) -{ - this->_set_noalias(Eigen::Map<const Matrix>(data)); -} } // end namespace Eigen |