From 20fcef9656301e55cb19d61c698de8fafd3cfa4c Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Thu, 4 Nov 2010 08:38:16 +0100 Subject: fixes related to ei_ -> internal change --- blas/level1_impl.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'blas/level1_impl.h') 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 -{ - enum { Cost = 3 * NumTraits::AddCost, PacketAccess = 0 }; -}; + namespace internal { + template<> struct functor_traits + { + enum { Cost = 3 * NumTraits::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().sum(); - else return vector(x,*n,std::abs(*incx)).unaryExpr().sum(); + if(*incx==1) return vector(x,*n).unaryExpr().sum(); + else return vector(x,*n,std::abs(*incx)).unaryExpr().sum(); } #endif -- cgit v1.2.3