diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2010-11-04 08:38:16 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2010-11-04 08:38:16 +0100 |
| commit | 20fcef9656301e55cb19d61c698de8fafd3cfa4c (patch) | |
| tree | 0a070a25e613d51166264716d1d6bef795031420 /blas/level1_impl.h | |
| parent | 62a51184d76e120c7c0484117db8c779a2c42c93 (diff) | |
fixes related to ei_ -> internal change
Diffstat (limited to 'blas/level1_impl.h')
| -rw-r--r-- | blas/level1_impl.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/blas/level1_impl.h b/blas/level1_impl.h index a24adc681..68580036c 100644 --- a/blas/level1_impl.h +++ b/blas/level1_impl.h @@ -55,16 +55,18 @@ RealScalar EIGEN_BLAS_FUNC(asum)(int *n, RealScalar *px, int *incx) } #else -struct internal::scalar_norm1_op { +struct scalar_norm1_op { typedef RealScalar result_type; - EIGEN_EMPTY_STRUCT_CTOR(internal::scalar_norm1_op) + EIGEN_EMPTY_STRUCT_CTOR(scalar_norm1_op) inline RealScalar operator() (const Scalar& a) const { return internal::norm1(a); } }; namespace Eigen { -template<> struct internal::functor_traits<internal::scalar_norm1_op > -{ - enum { Cost = 3 * NumTraits<Scalar>::AddCost, PacketAccess = 0 }; -}; + namespace internal { + template<> struct functor_traits<scalar_norm1_op > + { + enum { Cost = 3 * NumTraits<Scalar>::AddCost, PacketAccess = 0 }; + }; + } } RealScalar EIGEN_CAT(EIGEN_CAT(REAL_SCALAR_SUFFIX,SCALAR_SUFFIX),asum_)(int *n, RealScalar *px, int *incx) @@ -75,8 +77,8 @@ RealScalar EIGEN_CAT(EIGEN_CAT(REAL_SCALAR_SUFFIX,SCALAR_SUFFIX),asum_)(int *n, if(*n<=0) return 0; - if(*incx==1) return vector(x,*n).unaryExpr<internal::scalar_norm1_op>().sum(); - else return vector(x,*n,std::abs(*incx)).unaryExpr<internal::scalar_norm1_op>().sum(); + if(*incx==1) return vector(x,*n).unaryExpr<scalar_norm1_op>().sum(); + else return vector(x,*n,std::abs(*incx)).unaryExpr<scalar_norm1_op>().sum(); } #endif |