diff options
author | Gael Guennebaud <g.gael@free.fr> | 2016-05-25 10:00:11 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2016-05-25 10:00:11 +0200 |
commit | 2a1bff67fddc35e8ce0217fcf37835f71e4002a8 (patch) | |
tree | 6724370087f8ff9a1dccb38485a81d6f78742733 /Eigen/src/Core/ProductEvaluators.h | |
parent | 083566732937f5f57a4bfcaa68c46da795f465ab (diff) |
Fix static/inline order.
Diffstat (limited to 'Eigen/src/Core/ProductEvaluators.h')
-rw-r--r-- | Eigen/src/Core/ProductEvaluators.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index e2230037f..5b223d8bf 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -128,8 +128,8 @@ struct Assignment<DstXprType, Product<Lhs,Rhs,Options>, internal::assign_op<Scal typename enable_if<(Options==DefaultProduct || Options==AliasFreeProduct),Scalar>::type> { typedef Product<Lhs,Rhs,Options> SrcXprType; - EIGEN_STRONG_INLINE - static void run(DstXprType &dst, const SrcXprType &src, const internal::assign_op<Scalar> &) + static EIGEN_STRONG_INLINE + void run(DstXprType &dst, const SrcXprType &src, const internal::assign_op<Scalar> &) { // FIXME shall we handle nested_eval here? generic_product_impl<Lhs, Rhs>::evalTo(dst, src.lhs(), src.rhs()); @@ -142,8 +142,8 @@ struct Assignment<DstXprType, Product<Lhs,Rhs,Options>, internal::add_assign_op< typename enable_if<(Options==DefaultProduct || Options==AliasFreeProduct),Scalar>::type> { typedef Product<Lhs,Rhs,Options> SrcXprType; - EIGEN_STRONG_INLINE - static void run(DstXprType &dst, const SrcXprType &src, const internal::add_assign_op<Scalar> &) + static EIGEN_STRONG_INLINE + void run(DstXprType &dst, const SrcXprType &src, const internal::add_assign_op<Scalar> &) { // FIXME shall we handle nested_eval here? generic_product_impl<Lhs, Rhs>::addTo(dst, src.lhs(), src.rhs()); @@ -156,8 +156,8 @@ struct Assignment<DstXprType, Product<Lhs,Rhs,Options>, internal::sub_assign_op< typename enable_if<(Options==DefaultProduct || Options==AliasFreeProduct),Scalar>::type> { typedef Product<Lhs,Rhs,Options> SrcXprType; - EIGEN_STRONG_INLINE - static void run(DstXprType &dst, const SrcXprType &src, const internal::sub_assign_op<Scalar> &) + static EIGEN_STRONG_INLINE + void run(DstXprType &dst, const SrcXprType &src, const internal::sub_assign_op<Scalar> &) { // FIXME shall we handle nested_eval here? generic_product_impl<Lhs, Rhs>::subTo(dst, src.lhs(), src.rhs()); @@ -174,8 +174,8 @@ struct Assignment<DstXprType, CwiseUnaryOp<internal::scalar_multiple_op<ScalarBi { typedef CwiseUnaryOp<internal::scalar_multiple_op<ScalarBis>, const Product<Lhs,Rhs,DefaultProduct> > SrcXprType; - EIGEN_STRONG_INLINE - static void run(DstXprType &dst, const SrcXprType &src, const AssignFunc& func) + static EIGEN_STRONG_INLINE + void run(DstXprType &dst, const SrcXprType &src, const AssignFunc& func) { call_assignment_no_alias(dst, (src.functor().m_other * src.nestedExpression().lhs())*src.nestedExpression().rhs(), func); } @@ -196,8 +196,8 @@ template<typename DstXprType, typename OtherXpr, typename ProductType, typename struct assignment_from_xpr_plus_product { typedef CwiseBinaryOp<internal::scalar_sum_op<Scalar>, const OtherXpr, const ProductType> SrcXprType; - EIGEN_STRONG_INLINE - static void run(DstXprType &dst, const SrcXprType &src, const Func1& func) + static EIGEN_STRONG_INLINE + void run(DstXprType &dst, const SrcXprType &src, const Func1& func) { call_assignment_no_alias(dst, src.lhs(), func); call_assignment_no_alias(dst, src.rhs(), Func2()); |