diff options
author | Gael Guennebaud <g.gael@free.fr> | 2015-12-11 10:59:39 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2015-12-11 10:59:39 +0100 |
commit | 30b5c4cd14bcb9998916e6d782bc3b06465ec510 (patch) | |
tree | 0cd024d8705dbb7585d855ce7155bfbc38b3783c /Eigen/src/Core | |
parent | 79c1e6d0a63883cec691eaebcdbf0935ad557f70 (diff) |
Remove useless "explicit", and fix inline/static order.
Diffstat (limited to 'Eigen/src/Core')
-rwxr-xr-x[-rw-r--r--] | Eigen/src/Core/AssignEvaluator.h | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | Eigen/src/Core/VectorwiseOp.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/AssignEvaluator.h b/Eigen/src/Core/AssignEvaluator.h index db3bef38d..9dfffbcc4 100644..100755 --- a/Eigen/src/Core/AssignEvaluator.h +++ b/Eigen/src/Core/AssignEvaluator.h @@ -606,7 +606,7 @@ public: assignPacket<StoreMode,LoadMode,PacketType>(row, col); } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE static Index rowIndexByOuterInner(Index outer, Index inner) + EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE Index rowIndexByOuterInner(Index outer, Index inner) { typedef typename DstEvaluatorType::ExpressionTraits Traits; return int(Traits::RowsAtCompileTime) == 1 ? 0 @@ -615,7 +615,7 @@ public: : inner; } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE static Index colIndexByOuterInner(Index outer, Index inner) + EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE Index colIndexByOuterInner(Index outer, Index inner) { typedef typename DstEvaluatorType::ExpressionTraits Traits; return int(Traits::ColsAtCompileTime) == 1 ? 0 diff --git a/Eigen/src/Core/VectorwiseOp.h b/Eigen/src/Core/VectorwiseOp.h index dbc272dae..483f71909 100644..100755 --- a/Eigen/src/Core/VectorwiseOp.h +++ b/Eigen/src/Core/VectorwiseOp.h @@ -115,7 +115,7 @@ struct member_lpnorm { typedef ResultType result_type; template<typename Scalar, int Size> struct Cost { enum { value = (Size+5) * NumTraits<Scalar>::MulCost + (Size-1)*NumTraits<Scalar>::AddCost }; }; - EIGEN_DEVICE_FUNC explicit member_lpnorm() {} + EIGEN_DEVICE_FUNC member_lpnorm() {} template<typename XprType> EIGEN_DEVICE_FUNC inline ResultType operator()(const XprType& mat) const { return mat.template lpNorm<p>(); } |