diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-01-31 10:48:49 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-01-31 10:48:49 -0800 |
| commit | 3f1ee458333ab59218342d595b60536aee760f6a (patch) | |
| tree | 886c9c9a8da64940ff8cb93c6204c9889d3352cc | |
| parent | 70be6f6531cddc53803f392b92ca8e09499a9b70 (diff) | |
Fixed compilation errors triggered by duplicate inline declaration
| -rw-r--r-- | Eigen/src/Core/CwiseUnaryOp.h | 2 | ||||
| -rw-r--r-- | 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 ff1391996..1d2dd19f2 100644 --- a/Eigen/src/Core/CwiseUnaryOp.h +++ b/Eigen/src/Core/CwiseUnaryOp.h @@ -62,7 +62,7 @@ class CwiseUnaryOp : public CwiseUnaryOpImpl<UnaryOp, XprType, typename internal typedef typename internal::remove_all<XprType>::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 ea8283cea..5a38e5f22 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -389,9 +389,9 @@ template<typename Derived> 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<typename internal::eval<Derived>::type>::type EvalReturnType; /** \returns the matrix or vector obtained by evaluating this expression. |