Remove useless "explicit", and fix inline/static order.

This commit is contained in:
Gael Guennebaud 2015-12-11 10:59:39 +01:00
parent 79c1e6d0a6
commit 30b5c4cd14
5 changed files with 6 additions and 6 deletions

4
Eigen/src/Core/AssignEvaluator.h Normal file → Executable file
View File

@ -606,7 +606,7 @@ public:
assignPacket<StoreMode,LoadMode,PacketType>(row, col); 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; typedef typename DstEvaluatorType::ExpressionTraits Traits;
return int(Traits::RowsAtCompileTime) == 1 ? 0 return int(Traits::RowsAtCompileTime) == 1 ? 0
@ -615,7 +615,7 @@ public:
: inner; : 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; typedef typename DstEvaluatorType::ExpressionTraits Traits;
return int(Traits::ColsAtCompileTime) == 1 ? 0 return int(Traits::ColsAtCompileTime) == 1 ? 0

2
Eigen/src/Core/VectorwiseOp.h Normal file → Executable file
View File

@ -115,7 +115,7 @@ struct member_lpnorm {
typedef ResultType result_type; typedef ResultType result_type;
template<typename Scalar, int Size> struct Cost template<typename Scalar, int Size> struct Cost
{ enum { value = (Size+5) * NumTraits<Scalar>::MulCost + (Size-1)*NumTraits<Scalar>::AddCost }; }; { 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> template<typename XprType>
EIGEN_DEVICE_FUNC inline ResultType operator()(const XprType& mat) const EIGEN_DEVICE_FUNC inline ResultType operator()(const XprType& mat) const
{ return mat.template lpNorm<p>(); } { return mat.template lpNorm<p>(); }

2
Eigen/src/Eigenvalues/GeneralizedEigenSolver.h Normal file → Executable file
View File

@ -145,7 +145,7 @@ template<typename _MatrixType> class GeneralizedEigenSolver
* *
* \sa compute() * \sa compute()
*/ */
explicit GeneralizedEigenSolver(const MatrixType& A, const MatrixType& B, bool computeEigenvectors = true) GeneralizedEigenSolver(const MatrixType& A, const MatrixType& B, bool computeEigenvectors = true)
: m_eivec(A.rows(), A.cols()), : m_eivec(A.rows(), A.cols()),
m_alphas(A.cols()), m_alphas(A.cols()),
m_betas(A.cols()), m_betas(A.cols()),

2
Eigen/src/Eigenvalues/RealQZ.h Normal file → Executable file
View File

@ -101,7 +101,7 @@ namespace Eigen {
* *
* This constructor calls compute() to compute the QZ decomposition. * This constructor calls compute() to compute the QZ decomposition.
*/ */
explicit RealQZ(const MatrixType& A, const MatrixType& B, bool computeQZ = true) : RealQZ(const MatrixType& A, const MatrixType& B, bool computeQZ = true) :
m_S(A.rows(),A.cols()), m_S(A.rows(),A.cols()),
m_T(A.rows(),A.cols()), m_T(A.rows(),A.cols()),
m_Q(A.rows(),A.cols()), m_Q(A.rows(),A.cols()),

2
Eigen/src/SVD/JacobiSVD.h Normal file → Executable file
View File

@ -539,7 +539,7 @@ template<typename _MatrixType, int QRPreconditioner> class JacobiSVD
* according to the specified problem size. * according to the specified problem size.
* \sa JacobiSVD() * \sa JacobiSVD()
*/ */
explicit JacobiSVD(Index rows, Index cols, unsigned int computationOptions = 0) JacobiSVD(Index rows, Index cols, unsigned int computationOptions = 0)
{ {
allocate(rows, cols, computationOptions); allocate(rows, cols, computationOptions);
} }