aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/util/BlasUtil.h
diff options
context:
space:
mode:
authorGravatar Hauke Heibel <hauke.heibel@gmail.com>2010-10-25 22:13:49 +0200
committerGravatar Hauke Heibel <hauke.heibel@gmail.com>2010-10-25 22:13:49 +0200
commit7bc8e3ac0917cdc14015e00e8b29ac299b2b772a (patch)
tree8c6af03e1d27e0e035bc4bd9be042f78384d10e1 /Eigen/src/Core/util/BlasUtil.h
parent597b2745e1cfe1bf1cc4c4c189ecd16d2a0c1738 (diff)
Initial fixes for bug #85.
Renamed meta_{true|false} to {true|false}_type, meta_if to conditional, is_same_type to is_same, un{ref|pointer|const} to remove_{reference|pointer|const} and makeconst to add_const. Changed boolean type 'ret' member to 'value'. Changed 'ret' members refering to types to 'type'. Adapted all code occurences.
Diffstat (limited to 'Eigen/src/Core/util/BlasUtil.h')
-rw-r--r--Eigen/src/Core/util/BlasUtil.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/util/BlasUtil.h b/Eigen/src/Core/util/BlasUtil.h
index 7c976a5bc..d776c4507 100644
--- a/Eigen/src/Core/util/BlasUtil.h
+++ b/Eigen/src/Core/util/BlasUtil.h
@@ -173,10 +173,10 @@ template<typename XprType> struct blas_traits
int(inner_stride_at_compile_time<XprType>::ret) == 1)
) ? 1 : 0
};
- typedef typename meta_if<bool(HasUsableDirectAccess),
+ typedef typename conditional<bool(HasUsableDirectAccess),
ExtractType,
typename _ExtractType::PlainObject
- >::ret DirectLinearAccessType;
+ >::type DirectLinearAccessType;
static inline ExtractType extract(const XprType& x) { return x; }
static inline Scalar extractScalarFactor(const XprType&) { return Scalar(1); }
};
@@ -234,10 +234,10 @@ struct blas_traits<Transpose<NestedXpr> >
typedef Transpose<NestedXpr> XprType;
typedef Transpose<typename Base::_ExtractType> ExtractType;
typedef Transpose<typename Base::_ExtractType> _ExtractType;
- typedef typename meta_if<bool(Base::HasUsableDirectAccess),
+ typedef typename conditional<bool(Base::HasUsableDirectAccess),
ExtractType,
typename ExtractType::PlainObject
- >::ret DirectLinearAccessType;
+ >::type DirectLinearAccessType;
enum {
IsTransposed = Base::IsTransposed ? 0 : 1
};