diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-10-25 10:15:22 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-10-25 10:15:22 -0400 |
| commit | 4716040703be1ee906439385d20475dcddad5ce3 (patch) | |
| tree | 8efd3cf3007d8360e66f38e2d280127cbb70daa6 /Eigen/src/Core/ArrayWrapper.h | |
| parent | ca85a1f6c5fc33ac382aa2d7ba2da63d55d3223e (diff) | |
bug #86 : use internal:: namespace instead of ei_ prefix
Diffstat (limited to 'Eigen/src/Core/ArrayWrapper.h')
| -rw-r--r-- | Eigen/src/Core/ArrayWrapper.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Eigen/src/Core/ArrayWrapper.h b/Eigen/src/Core/ArrayWrapper.h index dc5bba443..814313f20 100644 --- a/Eigen/src/Core/ArrayWrapper.h +++ b/Eigen/src/Core/ArrayWrapper.h @@ -35,12 +35,15 @@ * * \sa MatrixBase::array(), class MatrixWrapper */ + +namespace internal { template<typename ExpressionType> -struct ei_traits<ArrayWrapper<ExpressionType> > - : public ei_traits<typename ei_cleantype<typename ExpressionType::Nested>::type > +struct traits<ArrayWrapper<ExpressionType> > + : public traits<typename cleantype<typename ExpressionType::Nested>::type > { typedef ArrayXpr XprKind; }; +} template<typename ExpressionType> class ArrayWrapper : public ArrayBase<ArrayWrapper<ExpressionType> > @@ -50,7 +53,7 @@ class ArrayWrapper : public ArrayBase<ArrayWrapper<ExpressionType> > EIGEN_DENSE_PUBLIC_INTERFACE(ArrayWrapper) EIGEN_INHERIT_ASSIGNMENT_OPERATORS(ArrayWrapper) - typedef typename ei_nested<ExpressionType>::type NestedExpressionType; + typedef typename internal::nested<ExpressionType>::type NestedExpressionType; inline ArrayWrapper(const ExpressionType& matrix) : m_expression(matrix) {} @@ -121,12 +124,14 @@ class ArrayWrapper : public ArrayBase<ArrayWrapper<ExpressionType> > * \sa MatrixBase::matrix(), class ArrayWrapper */ +namespace internal { template<typename ExpressionType> -struct ei_traits<MatrixWrapper<ExpressionType> > - : public ei_traits<typename ei_cleantype<typename ExpressionType::Nested>::type > +struct traits<MatrixWrapper<ExpressionType> > + : public traits<typename cleantype<typename ExpressionType::Nested>::type > { typedef MatrixXpr XprKind; }; +} template<typename ExpressionType> class MatrixWrapper : public MatrixBase<MatrixWrapper<ExpressionType> > @@ -136,7 +141,7 @@ class MatrixWrapper : public MatrixBase<MatrixWrapper<ExpressionType> > EIGEN_DENSE_PUBLIC_INTERFACE(MatrixWrapper) EIGEN_INHERIT_ASSIGNMENT_OPERATORS(MatrixWrapper) - typedef typename ei_nested<ExpressionType>::type NestedExpressionType; + typedef typename internal::nested<ExpressionType>::type NestedExpressionType; inline MatrixWrapper(const ExpressionType& matrix) : m_expression(matrix) {} |