From 3f1ee458333ab59218342d595b60536aee760f6a Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Sun, 31 Jan 2016 10:48:49 -0800 Subject: [PATCH] Fixed compilation errors triggered by duplicate inline declaration --- Eigen/src/Core/CwiseUnaryOp.h | 2 +- Eigen/src/Core/DenseBase.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Eigen/src/Core/CwiseUnaryOp.h b/Eigen/src/Core/CwiseUnaryOp.h index ff13919968..1d2dd19f2b 100644 --- a/Eigen/src/Core/CwiseUnaryOp.h +++ b/Eigen/src/Core/CwiseUnaryOp.h @@ -62,7 +62,7 @@ class CwiseUnaryOp : public CwiseUnaryOpImpl::type NestedExpression; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - explicit inline CwiseUnaryOp(const XprType& xpr, const UnaryOp& func = UnaryOp()) + explicit CwiseUnaryOp(const XprType& xpr, const UnaryOp& func = UnaryOp()) : m_xpr(xpr), m_functor(func) {} EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index ea8283cea9..5a38e5f22e 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -389,9 +389,9 @@ template class DenseBase inline bool allFinite() const; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - inline Derived& operator*=(const Scalar& other); + Derived& operator*=(const Scalar& other); EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - inline Derived& operator/=(const Scalar& other); + Derived& operator/=(const Scalar& other); typedef typename internal::add_const_on_value_type::type>::type EvalReturnType; /** \returns the matrix or vector obtained by evaluating this expression.