diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2012-01-31 12:58:52 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2012-01-31 12:58:52 +0100 |
| commit | 9c86ee26952cde01f91baa310e78b582483463c9 (patch) | |
| tree | 17b5dbc18a030280470ce28404ae88aa459d3dc0 /Eigen/src/Core/Assign_MKL.h | |
| parent | 8d6e394b060c7a531737e32902e2048915cb30ae (diff) | |
fix static inline versus inline static issues (the former is the correct order)
Diffstat (limited to 'Eigen/src/Core/Assign_MKL.h')
| -rw-r--r-- | Eigen/src/Core/Assign_MKL.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/Assign_MKL.h b/Eigen/src/Core/Assign_MKL.h index 39315c23c..15b95cf52 100644 --- a/Eigen/src/Core/Assign_MKL.h +++ b/Eigen/src/Core/Assign_MKL.h @@ -83,7 +83,7 @@ struct vml_assign_impl<Derived1, Derived2, UnaryOp, Traversal, Unrolling, InnerV { typedef typename Derived1::Scalar Scalar; typedef typename Derived1::Index Index; - inline static void run(Derived1& dst, const CwiseUnaryOp<UnaryOp, Derived2>& src) + static inline void run(Derived1& dst, const CwiseUnaryOp<UnaryOp, Derived2>& src) { // in case we want to (or have to) skip VML at runtime we can call: // assign_impl<Derived1,Eigen::CwiseUnaryOp<UnaryOp, Derived2>,Traversal,Unrolling,BuiltIn>::run(dst,src); @@ -101,7 +101,7 @@ struct vml_assign_impl<Derived1, Derived2, UnaryOp, Traversal, Unrolling, InnerV template<typename Derived1, typename Derived2, typename UnaryOp, int Traversal, int Unrolling> struct vml_assign_impl<Derived1, Derived2, UnaryOp, Traversal, Unrolling, LinearVectorizedTraversal> { - inline static void run(Derived1& dst, const CwiseUnaryOp<UnaryOp, Derived2>& src) + static inline void run(Derived1& dst, const CwiseUnaryOp<UnaryOp, Derived2>& src) { // in case we want to (or have to) skip VML at runtime we can call: // assign_impl<Derived1,Eigen::CwiseUnaryOp<UnaryOp, Derived2>,Traversal,Unrolling,BuiltIn>::run(dst,src); @@ -114,7 +114,7 @@ struct vml_assign_impl<Derived1, Derived2, UnaryOp, Traversal, Unrolling, Linear #define EIGEN_MKL_VML_SPECIALIZE_ASSIGN(TRAVERSAL,UNROLLING) \ template<typename Derived1, typename Derived2, typename UnaryOp> \ struct assign_impl<Derived1, Eigen::CwiseUnaryOp<UnaryOp, Derived2>, TRAVERSAL, UNROLLING, Specialized> { \ - inline static void run(Derived1 &dst, const Eigen::CwiseUnaryOp<UnaryOp, Derived2> &src) { \ + static inline void run(Derived1 &dst, const Eigen::CwiseUnaryOp<UnaryOp, Derived2> &src) { \ vml_assign_impl<Derived1,Derived2,UnaryOp,TRAVERSAL,UNROLLING>::run(dst, src); \ } \ }; |