From 4e1019e6822dac2618a0bfbedb010f359a958392 Mon Sep 17 00:00:00 2001 From: PBerger Date: Tue, 28 Jun 2016 02:25:30 +0200 Subject: [PATCH] Removed all mentions of EIGEN_DEPRECATED from Eigen Sources. Each instance triggers an error about an unexpected attribute "deprecated". It seems to be a combination of Eigen + Storm or other 3rd party libraries since this error does not apprear in stand-alone compilations with Eigen3. Former-commit-id: 994758be282f35137a08c3975162b0ce2b9d96dc --- .../eigen-3.3-beta1/Eigen/src/Core/DenseBase.h | 1 - .../Eigen/src/Core/functors/BinaryFunctors.h | 1 - .../Eigen/src/SparseCore/SparseVector.h | 16 ++++++++-------- .../Eigen/src/SparseExtra/DynamicSparseMatrix.h | 14 +++++++------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/DenseBase.h b/resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/DenseBase.h index e181dafaf..fd4ef025d 100644 --- a/resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/DenseBase.h +++ b/resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/DenseBase.h @@ -312,7 +312,6 @@ template class DenseBase /** \deprecated it now returns \c *this */ template - EIGEN_DEPRECATED const Derived& flagged() const { return derived(); } diff --git a/resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/functors/BinaryFunctors.h b/resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/functors/BinaryFunctors.h index 4962d625c..330f1370c 100644 --- a/resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/functors/BinaryFunctors.h +++ b/resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/functors/BinaryFunctors.h @@ -46,7 +46,6 @@ struct functor_traits > { * \sa DenseBase::count(), DenseBase::any(), ArrayBase::cast(), MatrixBase::cast() */ template<> struct scalar_sum_op : scalar_sum_op { - EIGEN_DEPRECATED scalar_sum_op() {} }; diff --git a/resources/3rdparty/eigen-3.3-beta1/Eigen/src/SparseCore/SparseVector.h b/resources/3rdparty/eigen-3.3-beta1/Eigen/src/SparseCore/SparseVector.h index 7ec73a365..2cfcae35b 100644 --- a/resources/3rdparty/eigen-3.3-beta1/Eigen/src/SparseCore/SparseVector.h +++ b/resources/3rdparty/eigen-3.3-beta1/Eigen/src/SparseCore/SparseVector.h @@ -306,47 +306,47 @@ class SparseVector public: /** \internal \deprecated use setZero() and reserve() */ - EIGEN_DEPRECATED void startFill(Index reserve) + void startFill(Index reserve) { setZero(); m_data.reserve(reserve); } /** \internal \deprecated use insertBack(Index,Index) */ - EIGEN_DEPRECATED Scalar& fill(Index r, Index c) + Scalar& fill(Index r, Index c) { eigen_assert(r==0 || c==0); return fill(IsColVector ? r : c); } /** \internal \deprecated use insertBack(Index) */ - EIGEN_DEPRECATED Scalar& fill(Index i) + Scalar& fill(Index i) { m_data.append(0, i); return m_data.value(m_data.size()-1); } /** \internal \deprecated use insert(Index,Index) */ - EIGEN_DEPRECATED Scalar& fillrand(Index r, Index c) + Scalar& fillrand(Index r, Index c) { eigen_assert(r==0 || c==0); return fillrand(IsColVector ? r : c); } /** \internal \deprecated use insert(Index) */ - EIGEN_DEPRECATED Scalar& fillrand(Index i) + Scalar& fillrand(Index i) { return insert(i); } /** \internal \deprecated use finalize() */ - EIGEN_DEPRECATED void endFill() {} + void endFill() {} // These two functions were here in the 3.1 release, so let's keep them in case some code rely on them. /** \internal \deprecated use data() */ - EIGEN_DEPRECATED Storage& _data() { return m_data; } + Storage& _data() { return m_data; } /** \internal \deprecated use data() */ - EIGEN_DEPRECATED const Storage& _data() const { return m_data; } + const Storage& _data() const { return m_data; } # ifdef EIGEN_SPARSEVECTOR_PLUGIN # include EIGEN_SPARSEVECTOR_PLUGIN diff --git a/resources/3rdparty/eigen-3.3-beta1/unsupported/Eigen/src/SparseExtra/DynamicSparseMatrix.h b/resources/3rdparty/eigen-3.3-beta1/unsupported/Eigen/src/SparseExtra/DynamicSparseMatrix.h index 037a13f86..e6ec9051b 100644 --- a/resources/3rdparty/eigen-3.3-beta1/unsupported/Eigen/src/SparseExtra/DynamicSparseMatrix.h +++ b/resources/3rdparty/eigen-3.3-beta1/unsupported/Eigen/src/SparseExtra/DynamicSparseMatrix.h @@ -225,14 +225,14 @@ template } /** The class DynamicSparseMatrix is deprectaed */ - EIGEN_DEPRECATED inline DynamicSparseMatrix() + inline DynamicSparseMatrix() : m_innerSize(0), m_data(0) { eigen_assert(innerSize()==0 && outerSize()==0); } /** The class DynamicSparseMatrix is deprectaed */ - EIGEN_DEPRECATED inline DynamicSparseMatrix(Index rows, Index cols) + inline DynamicSparseMatrix(Index rows, Index cols) : m_innerSize(0) { resize(rows, cols); @@ -240,7 +240,7 @@ template /** The class DynamicSparseMatrix is deprectaed */ template - EIGEN_DEPRECATED explicit inline DynamicSparseMatrix(const SparseMatrixBase& other) + explicit inline DynamicSparseMatrix(const SparseMatrixBase& other) : m_innerSize(0) { Base::operator=(other.derived()); @@ -281,7 +281,7 @@ template /** \deprecated * Set the matrix to zero and reserve the memory for \a reserveSize nonzero coefficients. */ - EIGEN_DEPRECATED void startFill(Index reserveSize = 1000) + void startFill(Index reserveSize = 1000) { setZero(); reserve(reserveSize); @@ -296,7 +296,7 @@ template * * \see fillrand(), coeffRef() */ - EIGEN_DEPRECATED Scalar& fill(Index row, Index col) + Scalar& fill(Index row, Index col) { const Index outer = IsRowMajor ? row : col; const Index inner = IsRowMajor ? col : row; @@ -308,14 +308,14 @@ template * Compared to the generic coeffRef(), the unique limitation is that we assume * the coefficient does not exist yet. */ - EIGEN_DEPRECATED Scalar& fillrand(Index row, Index col) + Scalar& fillrand(Index row, Index col) { return insert(row,col); } /** \deprecated use finalize() * Does nothing. Provided for compatibility with SparseMatrix. */ - EIGEN_DEPRECATED void endFill() {} + void endFill() {} # ifdef EIGEN_DYNAMICSPARSEMATRIX_PLUGIN # include EIGEN_DYNAMICSPARSEMATRIX_PLUGIN