diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-05-18 08:19:23 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-05-18 08:19:23 -0400 |
| commit | 5250c4395c1a3546f811f7322f90f9dc954f3fdd (patch) | |
| tree | 7e54061ec1d8d9c61aa8adb36ca0c8ce0d704d2b | |
| parent | cf6d3162cce31f608a9e2a3d7a722334fd8f7695 (diff) | |
compilation fix: const T ---> typename ei_makeconst<T>::type
(error was appearing when building tests with alignmnet disabled)
What is this stuff still doing in MatrixBase.h? Shouldn't it move to DenseBase.h? How are Array blocks compiling?
| -rw-r--r-- | Eigen/src/Core/ForceAlignedAccess.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/ForceAlignedAccess.h b/Eigen/src/Core/ForceAlignedAccess.h index bd70a11a9..eedd57751 100644 --- a/Eigen/src/Core/ForceAlignedAccess.h +++ b/Eigen/src/Core/ForceAlignedAccess.h @@ -133,7 +133,7 @@ MatrixBase<Derived>::forceAlignedAccess() */ template<typename Derived> template<bool Enable> -inline const typename ei_meta_if<Enable,ForceAlignedAccess<Derived>,Derived&>::ret +inline typename ei_makeconst<typename ei_meta_if<Enable,ForceAlignedAccess<Derived>,Derived&>::ret>::type MatrixBase<Derived>::forceAlignedAccessIf() const { return derived(); diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 8b4cbf560..c41bbefaa 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -268,7 +268,7 @@ template<typename Derived> class MatrixBase inline const ForceAlignedAccess<Derived> forceAlignedAccess() const; inline ForceAlignedAccess<Derived> forceAlignedAccess(); - template<bool Enable> inline const typename ei_meta_if<Enable,ForceAlignedAccess<Derived>,Derived&>::ret forceAlignedAccessIf() const; + template<bool Enable> inline typename ei_makeconst<typename ei_meta_if<Enable,ForceAlignedAccess<Derived>,Derived&>::ret>::type forceAlignedAccessIf() const; template<bool Enable> inline typename ei_meta_if<Enable,ForceAlignedAccess<Derived>,Derived&>::ret forceAlignedAccessIf(); Scalar trace() const; |