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/BooleanRedux.h | |
| parent | 8d6e394b060c7a531737e32902e2048915cb30ae (diff) | |
fix static inline versus inline static issues (the former is the correct order)
Diffstat (limited to 'Eigen/src/Core/BooleanRedux.h')
| -rw-r--r-- | Eigen/src/Core/BooleanRedux.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Core/BooleanRedux.h b/Eigen/src/Core/BooleanRedux.h index 5c3444a57..dc6192258 100644 --- a/Eigen/src/Core/BooleanRedux.h +++ b/Eigen/src/Core/BooleanRedux.h @@ -35,7 +35,7 @@ struct all_unroller row = (UnrollCount-1) % Derived::RowsAtCompileTime }; - inline static bool run(const Derived &mat) + static inline bool run(const Derived &mat) { return all_unroller<Derived, UnrollCount-1>::run(mat) && mat.coeff(row, col); } @@ -44,13 +44,13 @@ struct all_unroller template<typename Derived> struct all_unroller<Derived, 1> { - inline static bool run(const Derived &mat) { return mat.coeff(0, 0); } + static inline bool run(const Derived &mat) { return mat.coeff(0, 0); } }; template<typename Derived> struct all_unroller<Derived, Dynamic> { - inline static bool run(const Derived &) { return false; } + static inline bool run(const Derived &) { return false; } }; template<typename Derived, int UnrollCount> @@ -61,7 +61,7 @@ struct any_unroller row = (UnrollCount-1) % Derived::RowsAtCompileTime }; - inline static bool run(const Derived &mat) + static inline bool run(const Derived &mat) { return any_unroller<Derived, UnrollCount-1>::run(mat) || mat.coeff(row, col); } @@ -70,13 +70,13 @@ struct any_unroller template<typename Derived> struct any_unroller<Derived, 1> { - inline static bool run(const Derived &mat) { return mat.coeff(0, 0); } + static inline bool run(const Derived &mat) { return mat.coeff(0, 0); } }; template<typename Derived> struct any_unroller<Derived, Dynamic> { - inline static bool run(const Derived &) { return false; } + static inline bool run(const Derived &) { return false; } }; } // end namespace internal |