diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2012-08-02 12:22:22 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2012-08-02 12:22:22 +0200 |
| commit | c73c3ec2f89b1660ccdb8e1eadfc709b1e3b4532 (patch) | |
| tree | 7225e4b9ae8432d239ef263cfd87b3053d99107c /Eigen | |
| parent | e3ac608e4125fe13eb2e7dde30ff12d495986839 (diff) | |
fix bug #495: remove too aggressive EIGEN_FLATTEN_ATTRIB attribute
(after some benchmarking, it was not useful anymore)
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/products/GeneralBlockPanelKernel.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 5eb03c98c..09912fafb 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -527,7 +527,7 @@ struct gebp_kernel ResPacketSize = Traits::ResPacketSize }; - EIGEN_DONT_INLINE EIGEN_FLATTEN_ATTRIB + EIGEN_DONT_INLINE void operator()(ResScalar* res, Index resStride, const LhsScalar* blockA, const RhsScalar* blockB, Index rows, Index depth, Index cols, ResScalar alpha, Index strideA=-1, Index strideB=-1, Index offsetA=0, Index offsetB=0, RhsScalar* unpackedB = 0) { diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index 55cef28c2..5ea1fc8b4 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -115,12 +115,6 @@ #define EIGEN_MAKESTRING2(a) #a #define EIGEN_MAKESTRING(a) EIGEN_MAKESTRING2(a) -#if EIGEN_GNUC_AT_LEAST(4,1) && !defined(__clang__) && !defined(__INTEL_COMPILER) -#define EIGEN_FLATTEN_ATTRIB __attribute__((flatten)) -#else -#define EIGEN_FLATTEN_ATTRIB -#endif - // EIGEN_STRONG_INLINE is a stronger version of the inline, using __forceinline on MSVC, // but it still doesn't use GCC's always_inline. This is useful in (common) situations where MSVC needs forceinline // but GCC is still doing fine with just inline. |